diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2017-04-07 23:56:02 +0200 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2017-04-07 23:56:02 +0200 |
| commit | ff4fef570e8df6ce44ceb1d9071f860474eb1f95 (patch) | |
| tree | 601fc6ddfe72106f82e2ec6bac1c9abf854bccfa /cmake/Modules/FindJson.cmake | |
| parent | 4af99b75cf3ae43c365a4c1e90e85f8ec764cf62 (diff) | |
| download | minetest-ff4fef570e8df6ce44ceb1d9071f860474eb1f95.tar.gz minetest-ff4fef570e8df6ce44ceb1d9071f860474eb1f95.tar.bz2 minetest-ff4fef570e8df6ce44ceb1d9071f860474eb1f95.zip | |
Fix cmake library default build problem since moving to lib/
Also make Lua library check a cmake module
Diffstat (limited to 'cmake/Modules/FindJson.cmake')
| -rw-r--r-- | cmake/Modules/FindJson.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake index a51a17744..26339a295 100644 --- a/cmake/Modules/FindJson.cmake +++ b/cmake/Modules/FindJson.cmake @@ -20,7 +20,7 @@ endif() if(NOT JSONCPP_FOUND) message(STATUS "Using bundled JSONCPP library.") - set(JSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp PARENT_SCOPE) - set(JSON_LIBRARY jsoncpp PARENT_SCOPE) - add_subdirectory(jsoncpp) + set(JSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jsoncpp) + set(JSON_LIBRARY jsoncpp) + add_subdirectory(lib/jsoncpp) endif() |