Merge pull request #9 from toppers/remove_json_submodule

Remove json submodule
toppers · Jan 1, 2024 · b56bfcd · b56bfcd
2 parents d5163a6 + 7c09cf5
commit b56bfcd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -10,6 +10,10 @@ if(WIN32)
 endif(WIN32)
 MESSAGE(STATUS "OS_TYPE=" ${OS_TYPE})
 
+include(FetchContent)
+FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz)
+FetchContent_MakeAvailable(json)
+
 add_library(
     hako STATIC
     hako/hako_impl.cpp
@@ -39,6 +43,6 @@ target_include_directories(
     PRIVATE /mingw64/include
     PRIVATE ${PROJECT_SOURCE_DIR}/include
     PRIVATE ${PROJECT_SOURCE_DIR}/hako
-    PRIVATE ${PROJECT_SOURCE_DIR}/../third-party/json/single_include
+    PRIVATE ${nlohmann_json_SOURCE_DIR}/single_include
 )
 
diff --git a/third-party/json b/third-party/json