Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMakeLists: Use the jsoncpp submodule included in VRPN. #201

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CMakeLists: Use the jsoncpp submodule included in VRPN. #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,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)
Expand Down
8 changes: 8 additions & 0 deletions vendor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ endif()

# Build VRPN as subproject
set(VRPN_GPL_SERVER FALSE 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)
Expand Down Expand Up @@ -45,6 +46,13 @@ else()
target_include_directories(vendored-hidapi INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/vrpn/submodules/hidapi")
endif()

# Set the include directories for the jsoncpp_lib target.
if(VRPN_JSONCPP_SOURCE_ROOT)
target_include_directories(jsoncpp_lib INTERFACE "${VRPN_JSONCPP_SOURCE_ROOT}/include")
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")
Expand Down
2 changes: 1 addition & 1 deletion vendor/vrpn
Open in desktop
Submodule vrpn updated 18 files
+3 −1 CMakeLists.txt
+2 −0 Makefile
+1 −1 cmake/FindDirectShow.cmake
+9 −0 server_src/vrpn.cfg
+34 −9 server_src/vrpn_Generic_server_object.C
+1 −0 server_src/vrpn_Generic_server_object.h
+1 −1 server_src/vrpn_Phantom.C
+4 −2 submodules/CMakeLists.txt
+0 −1 submodules/jsoncpp.cmake
+8 −0 vrpn.dsp
+1 −1 vrpn_Analog.C
+3 −2 vrpn_Shared.h
+270 −0 vrpn_Streaming_Arduino.C
+50 −0 vrpn_Streaming_Arduino.h
+1 −1 vrpn_Text.h
+4 −0 vrpn_Thread.C
+103 −0 vrpn_streaming_arduino/vrpn_streaming_arduino.ino
+8 −0 vrpndll.dsp