[cmake] Improve nlohmann-json.cmake to be compatible with the usual p…

…ackage structure.
ethereum · Apr 10, 2024 · 7d1853c · 7d1853c
1 parent d2bb60a
commit 7d1853c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -24,7 +24,7 @@
 #pragma once
 
 #include <libsolutil/Assertions.h>
-#include <json/json.hpp>
+#include <nlohmann/json.hpp>
 
 #include <string>
 #include <string_view>