updated build system

2024-08-04 10:30:49 -05:00
parent 15cc7b0b87
commit 9ce4c5a494
13 changed files with 53 additions and 70 deletions
--- a/cmake/libraries/json.cmake
+++ b/cmake/libraries/json.cmake
@ -1,17 +1,13 @@
 if(PROJECT_ENABLE_JSON)
  if(PROJECT_BUILD)
-    find_package(nlohmann_json ${JSON_VERSION} REQUIRED)
-
    add_definitions(-DPROJECT_ENABLE_JSON)

+    find_package(nlohmann_json ${JSON_VERSION} REQUIRED)
+
    if(PROJECT_IS_MINGW AND PROJECT_IS_MINGW_UNIX)
-      include_directories(BEFORE SYSTEM
-        /mingw64/include/nlohmann
-      )
+      include_directories(BEFORE SYSTEM /mingw64/include/nlohmann)
    else()
-      include_directories(BEFORE SYSTEM
-        ${PROJECT_EXTERNAL_BUILD_ROOT}/include/nlohmann
-      )
+      include_directories(BEFORE SYSTEM ${PROJECT_EXTERNAL_BUILD_ROOT}/include/nlohmann)
    endif()
  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
    ExternalProject_Add(json_project