CMakeLists: Use the jsoncpp submodule as part of VRPN.

Author: CrossVR

CMakeLists.txt

@@ -162,12 +162,6 @@ endif()
 
 find_package(Threads REQUIRED)
 
-find_package(jsoncpp REQUIRED)
-if(TARGET jsoncpp_lib_static AND NOT TARGET jsoncpp_lib)
-    add_library(jsoncpp_lib INTERFACE)
-    target_link_libraries(jsoncpp_lib INTERFACE jsoncpp_lib_static)
-endif()
-
 include(CompilerFeatures)
 
 set(OPENCV_MODULES_USED)

vendor/CMakeLists.txt

@@ -12,6 +12,8 @@ endif()
 
 # Build VRPN as subproject
 set(VRPN_GPL_SERVER FALSE CACHE INTERNAL "" FORCE)
+set(VRPN_USE_JSONNET TRUE CACHE INTERNAL "" FORCE)
+set(VRPN_USE_LOCAL_JSONCPP TRUE CACHE INTERNAL "" FORCE)
 if(BUILD_CLIENT AND NOT BUILD_SERVER)
     set(VRPN_BUILD_SERVER_LIBRARY FALSE CACHE INTERNAL "" FORCE)
     set(VRPN_BUILD_CLIENT_LIBRARY TRUE CACHE INTERNAL "" FORCE)
@@ -45,6 +47,15 @@ else()
     target_include_directories(vendored-hidapi INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/vrpn/submodules/hidapi")
 endif()
 
+# Interface target for jsoncpp compiled as part of VRPN.
+add_library(jsoncpp_lib INTERFACE)
+target_link_libraries(jsoncpp_lib INTERFACE vendored-vrpn)
+if(JSONCPP_INCLUDE_DIRS)
+    target_include_directories(jsoncpp_lib INTERFACE "${JSONCPP_INCLUDE_DIRS}")
+else()
+    target_include_directories(jsoncpp_lib INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/vrpn/submodules/jsoncpp/include")
+endif()
+
 # Interface target for util headers
 add_library(util-headers INTERFACE)
 target_include_directories(util-headers INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/util-headers")