160 lines
4.2 KiB
Diff
160 lines
4.2 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index a03978b..0ad0c6d 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1245,16 +1245,10 @@ if(VRPN_BUILD_SERVER_LIBRARY)
|
|
if(VRPN_INSTALL)
|
|
install(TARGETS
|
|
vrpnserver
|
|
- ARCHIVE
|
|
- DESTINATION
|
|
- lib
|
|
- COMPONENT
|
|
- serversdk
|
|
- PUBLIC_HEADER
|
|
- DESTINATION
|
|
- include
|
|
- COMPONENT
|
|
- serversdk)
|
|
+ RUNTIME DESTINATION bin COMPONENT serversdk
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
|
|
+ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
|
|
endif()
|
|
add_cppcheck(vrpnserver STYLE UNUSED_FUNCTIONS)
|
|
endif()
|
|
@@ -1292,16 +1286,10 @@ if(VRPN_BUILD_CLIENT_LIBRARY)
|
|
if(VRPN_INSTALL)
|
|
install(TARGETS
|
|
vrpn
|
|
- ARCHIVE
|
|
- DESTINATION
|
|
- lib
|
|
- COMPONENT
|
|
- clientsdk
|
|
- PUBLIC_HEADER
|
|
- DESTINATION
|
|
- include
|
|
- COMPONENT
|
|
- clientsdk)
|
|
+ RUNTIME DESTINATION bin COMPONENT clientsdk
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
|
|
+ PUBLIC_HEADER DESTINATION include COMPONENT clientsdk)
|
|
endif()
|
|
add_cppcheck(vrpn STYLE UNUSED_FUNCTIONS)
|
|
endif()
|
|
diff --git a/atmellib/CMakeLists.txt b/atmellib/CMakeLists.txt
|
|
index 30d51f1..003785c 100644
|
|
--- a/atmellib/CMakeLists.txt
|
|
+++ b/atmellib/CMakeLists.txt
|
|
@@ -24,14 +24,8 @@ set_property(TARGET
|
|
if(VRPN_INSTALL)
|
|
install(TARGETS
|
|
vrpn_atmel
|
|
- ARCHIVE
|
|
- DESTINATION
|
|
- lib
|
|
- COMPONENT
|
|
- serversdk
|
|
- PUBLIC_HEADER
|
|
- DESTINATION
|
|
- include
|
|
- COMPONENT
|
|
- serversdk)
|
|
+ RUNTIME DESTINATION bin COMPONENT serversdk
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
|
|
+ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
|
|
endif()
|
|
diff --git a/gpsnmealib/CMakeLists.txt b/gpsnmealib/CMakeLists.txt
|
|
index fee7b3a..9a34e2d 100644
|
|
--- a/gpsnmealib/CMakeLists.txt
|
|
+++ b/gpsnmealib/CMakeLists.txt
|
|
@@ -25,14 +25,8 @@ set_property(TARGET gpsnmea PROPERTY FOLDER "Library")
|
|
if(VRPN_INSTALL)
|
|
install(TARGETS
|
|
gpsnmea
|
|
- ARCHIVE
|
|
- DESTINATION
|
|
- lib
|
|
- COMPONENT
|
|
- serversdk
|
|
- PUBLIC_HEADER
|
|
- DESTINATION
|
|
- include
|
|
- COMPONENT
|
|
- serversdk)
|
|
-endif()
|
|
\ No newline at end of file
|
|
+ RUNTIME DESTINATION bin COMPONENT serversdk
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
|
|
+ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
|
|
+endif()
|
|
diff --git a/quat/CMakeLists.txt b/quat/CMakeLists.txt
|
|
index 597776e..8d48c94 100644
|
|
--- a/quat/CMakeLists.txt
|
|
+++ b/quat/CMakeLists.txt
|
|
@@ -38,28 +38,16 @@ set_target_properties(quat PROPERTIES FOLDER Library)
|
|
if(VRPN_INSTALL)
|
|
install(TARGETS
|
|
quat
|
|
- ARCHIVE
|
|
- DESTINATION
|
|
- lib
|
|
- COMPONENT
|
|
- serversdk
|
|
- PUBLIC_HEADER
|
|
- DESTINATION
|
|
- include
|
|
- COMPONENT
|
|
- serversdk)
|
|
+ RUNTIME DESTINATION bin COMPONENT serversdk
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
|
|
+ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
|
|
install(TARGETS
|
|
quat
|
|
- ARCHIVE
|
|
- DESTINATION
|
|
- lib
|
|
- COMPONENT
|
|
- clientsdk
|
|
- PUBLIC_HEADER
|
|
- DESTINATION
|
|
- include
|
|
- COMPONENT
|
|
- clientsdk)
|
|
+ RUNTIME DESTINATION bin COMPONENT clientsdk
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT clientsdk
|
|
+ PUBLIC_HEADER DESTINATION include COMPONENT clientsdk)
|
|
endif()
|
|
|
|
add_subdirectory(testapps)
|
|
diff --git a/server_src/timecode_generator_server/CMakeLists.txt b/server_src/timecode_generator_server/CMakeLists.txt
|
|
index 5f8dce6..925bc44 100644
|
|
--- a/server_src/timecode_generator_server/CMakeLists.txt
|
|
+++ b/server_src/timecode_generator_server/CMakeLists.txt
|
|
@@ -25,14 +25,8 @@ set_target_properties(vrpn_timecode_generator
|
|
if(VRPN_INSTALL)
|
|
install(TARGETS
|
|
vrpn_timecode_generator
|
|
- ARCHIVE
|
|
- DESTINATION
|
|
- lib
|
|
- COMPONENT
|
|
- serversdk
|
|
- PUBLIC_HEADER
|
|
- DESTINATION
|
|
- include
|
|
- COMPONENT
|
|
- serversdk)
|
|
-endif()
|
|
\ No newline at end of file
|
|
+ RUNTIME DESTINATION bin COMPONENT serversdk
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT serversdk
|
|
+ PUBLIC_HEADER DESTINATION include COMPONENT serversdk)
|
|
+endif()
|