Fix cmake library default build problem since moving to lib/

Also make Lua library check a cmake module
2017-04-07 23:56:02 +02:00
parent 4af99b75cf
commit ff4fef570e
4 changed files with 17 additions and 19 deletions
--- 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()