Fix nlohmann-json cmake script (thanks matjson for this error again 👍)

SpaghettDev · Jan 31, 2024 · 5aa8b3e · 5aa8b3e
1 parent 3b2c2e3
commit 5aa8b3e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,11 +35,11 @@ setup_geode_mod(${PROJECT_NAME})
 include(scripts/git.cmake)
 
 message("Getting modules\n")
-include(scripts/json.cmake)
+include(scripts/nhjson.cmake)
 include(scripts/curl.cmake)
 
 target_include_directories(${PROJECT_NAME} PRIVATE
-    ${json_SOURCE_DIR}/single_include
+    ${nhjson_SOURCE_DIR}/single_include
     ${curl_INCLUDE_DIRS}
 )
 

diff --git a/scripts/json.cmake → scripts/nhjson.cmake b/scripts/json.cmake → scripts/nhjson.cmake
@@ -2,11 +2,12 @@ include(FetchContent)
 
 set(JSON_MultipleHeaders OFF)
 
+# deprecated, move to nlohmann-json releases
 FetchContent_Declare(
-    json
+    nhjson
     GIT_REPOSITORY https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent.git
-    GIT_TAG        67e6070f9d9a44b4dec79ebe6b591f39d2285593
+    GIT_TAG        326308d7512d2168ae00199aec4dd0f714526e89
     GIT_PROGRESS TRUE
 )
 message("Fetching nlohmann-json")
-FetchContent_MakeAvailable(json)
+FetchContent_MakeAvailable(nhjson)