luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-12 08:05:18 +02:00
Code Activity

Fix cmake library default build problem since moving to lib/

Browse Source 
Also make Lua library check a cmake module
This commit is contained in:
Loic Blot
2017-04-07 23:56:02 +02:00
parent 4af99b75cf
commit ff4fef570e
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/Modules/FindJson.cmake
View File

@@ -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()