From 7d1853c3b533305014ef9d239e0bc057cc4ec266 Mon Sep 17 00:00:00 2001 From: Alexander Arlt Date: Wed, 10 Apr 2024 17:01:10 +0200 Subject: [PATCH] [cmake] Improve nlohmann-json.cmake to be compatible with the usual package structure. --- cmake/nlohmann-json.cmake | 2 +- libsolutil/JSON.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/nlohmann-json.cmake b/cmake/nlohmann-json.cmake index f2e1b5a56b00..02891e6a7ba6 100644 --- a/cmake/nlohmann-json.cmake +++ b/cmake/nlohmann-json.cmake @@ -1,7 +1,7 @@ include(ExternalProject) ExternalProject_Add(nlohmann-json-project - DOWNLOAD_DIR "${CMAKE_SOURCE_DIR}/deps/nlohmann/json" + DOWNLOAD_DIR "${CMAKE_SOURCE_DIR}/deps/nlohmann/nlohmann" DOWNLOAD_NAME json.hpp DOWNLOAD_NO_EXTRACT 1 URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.hpp diff --git a/libsolutil/JSON.h b/libsolutil/JSON.h index be0737384ed1..2cdac70c7857 100644 --- a/libsolutil/JSON.h +++ b/libsolutil/JSON.h @@ -24,7 +24,7 @@ #pragma once #include -#include +#include #include #include