immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another fix

dev
Tomasz Kapuściński 2022-02-26 21:42:09 +01:00
parent 628567701a
commit c011e49112
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -320,8 +320,13 @@ if(NOT TARGET glm::glm)
add_library(glm::glm ALIAS glm) add_library(glm::glm ALIAS glm)
endif() endif()
add_subdirectory(lib/json) find_package(nlohmann_json 3.10 QUIET)
find_package(nlohmann_json CONFIG REQUIRED)
if(NOT nlohmann_json_FOUND)
message(STATUS "Using nlohmann_json git submodule")
set(JSON_BuildTests OFF CACHE INTERNAL "")
add_subdirectory(lib/json)
endif()
set(Boost_USE_STATIC_LIBS ${BOOST_STATIC}) set(Boost_USE_STATIC_LIBS ${BOOST_STATIC})
set(Boost_USE_MULTITHREADED ON) set(Boost_USE_MULTITHREADED ON)