[openrtm-commit:03359] r3432 - in trunk/OpenRTM-aist: examples/Analyzer examples/AutoTest examples/Composite examples/ConfigSample examples/ExtTrigger examples/HelloWorld examples/SeqIO examples/SimpleIO examples/SimpleService examples/StaticFsm examples/StringIO examples/Throughput src/ext/ec/logical_time src/ext/ssl src/lib/coil src/lib/rtm src/lib/rtm/ext/rtmCamera src/lib/rtm/ext/rtmManipulator utils/rtcd utils/rtcprof utils/rtcsh
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 11月 6日 (火) 17:02:46 JST
Author: miyamoto
Date: 2018-11-06 17:02:46 +0900 (Tue, 06 Nov 2018)
New Revision: 3432
Modified:
trunk/OpenRTM-aist/examples/Analyzer/CMakeLists.txt
trunk/OpenRTM-aist/examples/AutoTest/CMakeLists.txt
trunk/OpenRTM-aist/examples/Composite/CMakeLists.txt
trunk/OpenRTM-aist/examples/ConfigSample/CMakeLists.txt
trunk/OpenRTM-aist/examples/ExtTrigger/CMakeLists.txt
trunk/OpenRTM-aist/examples/HelloWorld/CMakeLists.txt
trunk/OpenRTM-aist/examples/SeqIO/CMakeLists.txt
trunk/OpenRTM-aist/examples/SimpleIO/CMakeLists.txt
trunk/OpenRTM-aist/examples/SimpleService/CMakeLists.txt
trunk/OpenRTM-aist/examples/StaticFsm/CMakeLists.txt
trunk/OpenRTM-aist/examples/StringIO/CMakeLists.txt
trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt
trunk/OpenRTM-aist/src/ext/ec/logical_time/CMakeLists.txt
trunk/OpenRTM-aist/src/ext/ssl/CMakeLists.txt
trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt
trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt
trunk/OpenRTM-aist/src/lib/rtm/ext/rtmCamera/CMakeLists.txt
trunk/OpenRTM-aist/src/lib/rtm/ext/rtmManipulator/CMakeLists.txt
trunk/OpenRTM-aist/utils/rtcd/CMakeLists.txt
trunk/OpenRTM-aist/utils/rtcprof/CMakeLists.txt
trunk/OpenRTM-aist/utils/rtcsh/CMakeLists.txt
Log:
[compat, cmake]
Modified: trunk/OpenRTM-aist/examples/Analyzer/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/Analyzer/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/examples/Analyzer/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -27,7 +27,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -47,12 +49,14 @@
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
endif()
@@ -80,7 +84,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -97,12 +103,14 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
endif()
Modified: trunk/OpenRTM-aist/examples/AutoTest/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/AutoTest/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/examples/AutoTest/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -49,7 +49,9 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
add_dependencies(${target} ${idl_name}_TGT)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -68,12 +70,14 @@
add_dependencies(${target} ${idl_name}_TGT)
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
endif()
set_source_files_properties(${${idl_name}_SKEL} PROPERTIES GENERATED 1)
@@ -104,7 +108,9 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
add_dependencies(${target} ${idl_name}_TGT)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -123,12 +129,14 @@
add_dependencies(${target} ${idl_name}_TGT)
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
endif()
set_source_files_properties(${${idl_name}_STUB} PROPERTIES GENERATED 1)
Modified: trunk/OpenRTM-aist/examples/Composite/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/Composite/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/examples/Composite/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -25,7 +25,9 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
-install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(VXWORKS)
@@ -56,7 +58,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -73,12 +77,14 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
endif()
@@ -105,7 +111,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -122,12 +130,14 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
endif()
@@ -154,7 +164,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -171,12 +183,14 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
endif()
Modified: trunk/OpenRTM-aist/examples/ConfigSample/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/ConfigSample/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/examples/ConfigSample/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -25,7 +25,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -44,12 +46,13 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif()
Modified: trunk/OpenRTM-aist/examples/ExtTrigger/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/ExtTrigger/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/examples/ExtTrigger/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -25,7 +25,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -42,12 +44,14 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
endif()
if(VXWORKS)
@@ -73,7 +77,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -90,12 +96,13 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif()
@@ -131,7 +138,9 @@
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif()
Modified: trunk/OpenRTM-aist/examples/HelloWorld/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/HelloWorld/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/examples/HelloWorld/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -25,7 +25,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -42,12 +44,13 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif()
Modified: trunk/OpenRTM-aist/examples/SeqIO/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/SeqIO/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/examples/SeqIO/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -27,7 +27,9 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
add_dependencies(${target} ${idl_name}_TGT)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -44,12 +46,14 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
endif()
if(VXWORKS)
@@ -76,7 +80,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -93,12 +99,14 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
endif()
Modified: trunk/OpenRTM-aist/examples/SimpleIO/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/SimpleIO/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/examples/SimpleIO/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -25,7 +25,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -42,12 +44,14 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
endif()
if(VXWORKS)
@@ -75,7 +79,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -92,12 +98,14 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
endif()
Modified: trunk/OpenRTM-aist/examples/SimpleService/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/SimpleService/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/examples/SimpleService/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -50,7 +50,9 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
add_dependencies(${target} ${idl_name}_TGT)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -69,12 +71,14 @@
add_dependencies(${target} ${idl_name}_TGT)
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
endif()
@@ -110,7 +114,9 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
add_dependencies(${target} ${idl_name}_TGT)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -129,12 +135,13 @@
add_dependencies(${target} ${idl_name}_TGT)
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif()
set_source_files_properties(${${idl_name}_SKEL} PROPERTIES GENERATED 1)
Modified: trunk/OpenRTM-aist/examples/StaticFsm/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/StaticFsm/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/examples/StaticFsm/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -25,7 +25,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -42,12 +44,14 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
endif()
if(VXWORKS)
@@ -75,7 +79,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -92,12 +98,14 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
endif()
@@ -126,7 +134,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -143,12 +153,14 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
endif()
Modified: trunk/OpenRTM-aist/examples/StringIO/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/StringIO/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/examples/StringIO/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -25,7 +25,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -42,12 +44,14 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
endif()
@@ -74,7 +78,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -91,12 +97,13 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
- endif(WIN32)
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif()
if(VXWORKS)
if(RTP)
Modified: trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -27,7 +27,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -45,13 +47,17 @@
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
file(GLOB script_files "scripts/*")
install(FILES ${script_files} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
Modified: trunk/OpenRTM-aist/src/ext/ec/logical_time/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/logical_time/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/src/ext/ec/logical_time/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -73,7 +73,7 @@
endif()
-set_source_files_properties(${${idl_name}_STUB} PROPERTIES GENERATED 1)
+set_source_files_properties(${${idl_name}_SKEL} PROPERTIES GENERATED 1)
Modified: trunk/OpenRTM-aist/src/ext/ssl/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/ssl/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/src/ext/ssl/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -45,7 +45,21 @@
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ssl
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/ssl
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ssl)
+
+
+ file(GLOB OPENSSL_DLLS1 "${OPENSSL_ROOT}/bin/libcrypto*.dll")
+ file(GLOB OPENSSL_DLLS2 "${OPENSSL_ROOT}/bin/libssl*.dll")
+
+ foreach(library ${OPENSSL_DLLS1};${OPENSSL_DLLS2})
+ install(PROGRAMS ${library} DESTINATION ${INSTALL_RTM_EXT_DIR}/ssl)
+ endforeach()
+ install(PROGRAMS ${OPENSSL_ROOT}/bin/openssl.exe DESTINATION ${INSTALL_RTM_EXT_DIR}/ssl)
+
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ssl)
+ install(TARGETS ${target} LIBRARY DESTINATION LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ssl
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/ssl
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ssl)
endif(WIN32)
Modified: trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -164,13 +164,17 @@
if(VXWORKS)
add_library(${COIL_PROJECT_NAME} STATIC ${coil_srcs} )
- install(TARGETS ${COIL_PROJECT_NAME} ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR})
+ install(TARGETS ${COIL_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_BIN_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
else(VXWORKS)
add_library(${COIL_PROJECT_NAME} SHARED ${coil_srcs} )
set_target_properties(${COIL_PROJECT_NAME} PROPERTIES DEBUG_POSTFIX d)
target_link_libraries(${COIL_PROJECT_NAME} ${RTM_LINKER_OPTION})
if(UNIX)
- install(TARGETS ${COIL_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR})
+ install(TARGETS ${COIL_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
elseif(WIN32)
set_source_files_properties(${DEF_FILE_NAME} PROPERTIES GENERATED 1)
add_dependencies(${COIL_PROJECT_NAME} ${COIL_PROJECT_NAME}_TGT)
Modified: trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -466,7 +466,10 @@
if(VXWORKS)
add_library(${RTM_PROJECT_NAME} STATIC ${rtm_srcs})
- install(TARGETS ${RTM_PROJECT_NAME} ARCHIVE DESTINATION ${INSTALL_RTM_BIN_DIR})
+ install(TARGETS ${RTM_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_BIN_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+
else(VXWORKS)
add_library(${RTM_PROJECT_NAME} SHARED ${rtm_srcs})
@@ -479,7 +482,9 @@
if(UNIX)
target_link_libraries(${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME} ${RTM_LINKER_OPTION})
- install(TARGETS ${RTM_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR})
+ install(TARGETS ${RTM_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
elseif(WIN32)
target_link_libraries(${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTM_LINKER_OPTION})
add_dependencies(${RTM_PROJECT_NAME} ALL_IDL_TGT)
@@ -487,7 +492,7 @@
add_dependencies(${RTM_PROJECT_NAME} ${RTM_PROJECT_NAME}_TGT)
add_dependencies(${RTM_PROJECT_NAME} ${RTM_PROJECT_NAME}_static)
install(TARGETS ${RTM_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
- ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR})
endif()
Modified: trunk/OpenRTM-aist/src/lib/rtm/ext/rtmCamera/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ext/rtmCamera/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/rtmCamera/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -112,13 +112,17 @@
if(VXWORKS)
add_library(${target} SHARED ${ALL_IDL_SRCS})
- install(TARGETS ${RTM_PROJECT_NAME} ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR})
+ install(TARGETS ${RTM_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_BIN_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
else(VXWORKS)
add_library(${target} SHARED ${ALL_IDL_SRCS})
set_target_properties(${target} PROPERTIES DEBUG_POSTFIX d)
target_link_libraries(${target} ${ORB_LIBRARIES} ${RTCSKEL_PROJECT_NAME})
if(UNIX)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
elseif(WIN32)
set_source_files_properties(${DEF_FILE_NAME} PROPERTIES GENERATED 1)
add_dependencies(${target} ${target}_TGT)
Modified: trunk/OpenRTM-aist/src/lib/rtm/ext/rtmManipulator/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ext/rtmManipulator/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/rtmManipulator/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -113,13 +113,17 @@
if(VXWORKS)
add_library(${target} SHARED ${ALL_IDL_SRCS})
- install(TARGETS ${RTM_PROJECT_NAME} ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR})
+ install(TARGETS ${RTM_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_BIN_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_BIN_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
else(VXWORKS)
add_library(${target} SHARED ${ALL_IDL_SRCS})
set_target_properties(${target} PROPERTIES DEBUG_POSTFIX d)
target_link_libraries(${target} ${ORB_LIBRARIES} ${RTCSKEL_PROJECT_NAME})
if(UNIX)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
elseif(WIN32)
set_source_files_properties(${DEF_FILE_NAME} PROPERTIES GENERATED 1)
add_dependencies(${target} ${target}_TGT)
Modified: trunk/OpenRTM-aist/utils/rtcd/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtcd/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/utils/rtcd/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -43,5 +43,12 @@
endif(RTP)
endif(VXWORKS)
-
-install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
\ No newline at end of file
+if(WIN32)
+install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR})
+else(WIN32)
+install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+endif(WIN32)
\ No newline at end of file
Modified: trunk/OpenRTM-aist/utils/rtcprof/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtcprof/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/utils/rtcprof/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -50,4 +50,15 @@
endif(VXWORKS)
-install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+
+
+
+if(WIN32)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR})
+else(WIN32)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+endif(WIN32)
\ No newline at end of file
Modified: trunk/OpenRTM-aist/utils/rtcsh/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtcsh/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
+++ trunk/OpenRTM-aist/utils/rtcsh/CMakeLists.txt 2018-11-06 08:02:46 UTC (rev 3432)
@@ -23,4 +23,20 @@
target_link_libraries(${target} ${libs} ${RTM_LINKER_OPTION})
-install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+if(VXWORKS)
+ if(RTP)
+ set_target_properties(${target} PROPERTIES SUFFIX ".vxe")
+ else(RTP)
+ set_target_properties(${target} PROPERTIES SUFFIX ".out")
+ endif(RTP)
+endif(VXWORKS)
+
+if(WIN32)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR})
+else(WIN32)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+endif(WIN32)
openrtm-commit メーリングリストの案内