Update embedded jsoncpp from unk version to 0.10.6 + move libs to lib/ instead of...

[oweals/minetest.git] / cmake / Modules / FindJson.cmake

diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake
index e69d6c4c0dab408b1904de69bf1029357f207441..a51a1774474414cb118656bd1e2b545c9918e33d 100644 (file)
--- 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()
-