diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-04-02 10:51:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-02 10:51:50 +0200 |
| commit | 86b1542181a92841d174e1caec94d084a34e5158 (patch) | |
| tree | f18378dd6aa5959b28c5ff8eed19084a288acd1d /cmake | |
| parent | 75fb3e47308823cf39d4aae0fd739ca445e8e36c (diff) | |
| download | minetest-86b1542181a92841d174e1caec94d084a34e5158.tar.gz minetest-86b1542181a92841d174e1caec94d084a34e5158.tar.bz2 minetest-86b1542181a92841d174e1caec94d084a34e5158.zip | |
Update embedded jsoncpp from unk version to 0.10.6 + move libs to lib/ instead of src/ (#5473)
* Update embedded jsoncpp from unk version to 0.10.6
0.10.6 is last release without c++11
* Make jsoncpp more compliant with its amalgamate
Jsoncpp cpp file should be upper, make the library like it does in amalgamate
* Reorganization: move minetest embedded libs outside of source tree to /lib
* Fix a dead grep in LINT
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindGMP.cmake | 8 | ||||
| -rw-r--r-- | cmake/Modules/FindJson.cmake | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/cmake/Modules/FindGMP.cmake b/cmake/Modules/FindGMP.cmake index bb48289c5..d584eb1e7 100644 --- a/cmake/Modules/FindGMP.cmake +++ b/cmake/Modules/FindGMP.cmake @@ -1,7 +1,6 @@ - option(ENABLE_SYSTEM_GMP "Use GMP from system" TRUE) mark_as_advanced(GMP_LIBRARY GMP_INCLUDE_DIR) -set(USE_SYSTEM_GMP FALSE) +set(USE_SYSTEM_GMP FALSE PARENT_SCOPE) if(ENABLE_SYSTEM_GMP) find_library(GMP_LIBRARY NAMES libgmp.so) @@ -10,6 +9,7 @@ if(ENABLE_SYSTEM_GMP) if(GMP_LIBRARY AND GMP_INCLUDE_DIR) message (STATUS "Using GMP provided by system.") set(USE_SYSTEM_GMP TRUE) + set(USE_SYSTEM_GMP TRUE PARENT_SCOPE) else() message (STATUS "Detecting GMP from system failed.") endif() @@ -19,8 +19,10 @@ endif() if(NOT USE_SYSTEM_GMP) message(STATUS "Using bundled mini-gmp library.") - set(GMP_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/gmp) + set(GMP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gmp) + set(GMP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gmp PARENT_SCOPE) set(GMP_LIBRARY gmp) + set(GMP_LIBRARY gmp PARENT_SCOPE) add_subdirectory(gmp) endif() diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake index e69d6c4c0..a51a17744 100644 --- a/cmake/Modules/FindJson.cmake +++ b/cmake/Modules/FindJson.cmake @@ -20,8 +20,7 @@ endif() if(NOT JSONCPP_FOUND) message(STATUS "Using bundled JSONCPP library.") - set(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/jsoncpp) - set(JSON_LIBRARY jsoncpp) - add_subdirectory(jsoncpp/json) + set(JSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp PARENT_SCOPE) + set(JSON_LIBRARY jsoncpp PARENT_SCOPE) + add_subdirectory(jsoncpp) endif() - |