[openrtm-commit:03373] r3445 - in trunk/OpenRTM-aist: . docs etc examples/Analyzer examples/AutoTest examples/Composite examples/ConfigSample examples/ExtTrigger examples/HelloWorld examples/SeqIO examples/SimpleIO examples/SimpleService examples/StaticFsm examples/StringIO examples/Templates examples/Throughput src/ext/ec/artlinux src/ext/ec/logical_time src/ext/ec/rtpreempt src/ext/local_service/nameservice_file src/ext/sdo/extended_fsm src/ext/sdo/fsm4rtc_observer src/ext/sdo/logger src/ext/ssl src/lib/coil src/lib/coil/utils/coil-config src/lib/rtm src/lib/rtm/ext/rtmCamera src/lib/rtm/ext/rtmManipulator src/lib/rtm/idl src/lib/rtm/idl/device_interfaces utils/cmake utils/rtc-template utils/rtcd utils/rtcprof utils/rtcsh utils/rtm-config utils/rtm-naming utils/rtm-skelwrapper
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 11月 16日 (金) 10:08:23 JST
Author: miyamoto
Date: 2018-11-16 10:08:23 +0900 (Fri, 16 Nov 2018)
New Revision: 3445
Modified:
trunk/OpenRTM-aist/CMakeLists.txt
trunk/OpenRTM-aist/docs/CMakeLists.txt
trunk/OpenRTM-aist/etc/CMakeLists.txt
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/Templates/CMakeLists.txt
trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt
trunk/OpenRTM-aist/src/ext/ec/artlinux/CMakeLists.txt
trunk/OpenRTM-aist/src/ext/ec/logical_time/CMakeLists.txt
trunk/OpenRTM-aist/src/ext/ec/rtpreempt/CMakeLists.txt
trunk/OpenRTM-aist/src/ext/local_service/nameservice_file/CMakeLists.txt
trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/CMakeLists.txt
trunk/OpenRTM-aist/src/ext/sdo/fsm4rtc_observer/CMakeLists.txt
trunk/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt
trunk/OpenRTM-aist/src/ext/ssl/CMakeLists.txt
trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt
trunk/OpenRTM-aist/src/lib/coil/utils/coil-config/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/src/lib/rtm/idl/CMakeLists.txt
trunk/OpenRTM-aist/src/lib/rtm/idl/device_interfaces/CMakeLists.txt
trunk/OpenRTM-aist/utils/cmake/CMakeLists.txt
trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig_TAO.cmake.in
trunk/OpenRTM-aist/utils/rtc-template/CMakeLists.txt
trunk/OpenRTM-aist/utils/rtcd/CMakeLists.txt
trunk/OpenRTM-aist/utils/rtcprof/CMakeLists.txt
trunk/OpenRTM-aist/utils/rtcsh/CMakeLists.txt
trunk/OpenRTM-aist/utils/rtm-config/CMakeLists.txt
trunk/OpenRTM-aist/utils/rtm-naming/CMakeLists.txt
trunk/OpenRTM-aist/utils/rtm-skelwrapper/CMakeLists.txt
Log:
[compat, cmake]
Modified: trunk/OpenRTM-aist/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -181,7 +181,11 @@
endif()
endif()
if(UNIX)
- SET(IDLCOMMAND_FLAGS -as -DTAO_IDL -I${ORB_ROOT}/include)
+ if(test${ORB_ROOT} STREQUAL "test")
+ SET(IDLCOMMAND_FLAGS -as -DTAO_IDL -I/usr/include -I/usr/local/include)
+ else()
+ SET(IDLCOMMAND_FLAGS -as -DTAO_IDL -I${ORB_ROOT}/include)
+ endif()
elseif(VXWORKS)
SET(IDLCOMMAND_FLAGS -as -DTAO_IDL -I${ORB_ROOT}/TAO)
elseif(MSVC)
@@ -322,9 +326,9 @@
foreach(library ${ORB_LIBRARIES};${ORBSSL_LIBRARIES})
if((NOT (${library} STREQUAL "optimized")) AND (NOT (${library} STREQUAL "debug")))
string(REPLACE "_rt" "_${RTM_VC_VER}_rt" dll "${library}")
- install(PROGRAMS "${OMNIORB_BINARY_DIR}/${dll}.dll" DESTINATION ${ORB_INSTALL_DIR}/bin/${ARCH_NAME})
- install(PROGRAMS "${OMNIORB_BINARY_DIR}/${dll}.pdb" DESTINATION ${ORB_INSTALL_DIR}/bin/${ARCH_NAME})
- install(PROGRAMS "${ORB_LINK_DIR}/${library}.lib" DESTINATION ${ORB_INSTALL_DIR}/lib/${ARCH_NAME})
+ install(PROGRAMS "${OMNIORB_BINARY_DIR}/${dll}.dll" DESTINATION ${ORB_INSTALL_DIR}/bin/${ARCH_NAME} COMPONENT corbalib)
+ install(PROGRAMS "${OMNIORB_BINARY_DIR}/${dll}.pdb" DESTINATION ${ORB_INSTALL_DIR}/bin/${ARCH_NAME} COMPONENT corbalib)
+ install(PROGRAMS "${ORB_LINK_DIR}/${library}.lib" DESTINATION ${ORB_INSTALL_DIR}/lib/${ARCH_NAME} COMPONENT corbalib)
endif()
endforeach()
@@ -346,7 +350,7 @@
get_filename_component(dir_path "${file_path}" DIRECTORY)
string(REPLACE "${ORB_ROOT}/include" "" file "${dir_path}")
#message(STATUS ${dir_path})
- install(FILES ${file_path} DESTINATION ${ORB_INSTALL_DIR}/include/${file})
+ install(FILES ${file_path} DESTINATION ${ORB_INSTALL_DIR}/include/${file} COMPONENT corbalib)
endforeach()
@@ -357,16 +361,16 @@
foreach(file_path ${OMNIORB_IDLFILES})
get_filename_component(dir_path "${file_path}" DIRECTORY)
string(REPLACE "${ORB_ROOT}/idl" "" file "${dir_path}")
- install(FILES ${file_path} DESTINATION ${ORB_INSTALL_DIR}/idl/${file})
+ install(FILES ${file_path} DESTINATION ${ORB_INSTALL_DIR}/idl/${file} COMPONENT corbalib)
endforeach()
file(GLOB OMNIORB_SCRIPTS "${ORB_ROOT}/bin/scripts/*.py")
foreach(file_path ${OMNIORB_SCRIPTS})
- install(FILES ${OMNIORB_SCRIPTS} DESTINATION ${ORB_INSTALL_DIR}/bin/scripts)
+ install(FILES ${OMNIORB_SCRIPTS} DESTINATION ${ORB_INSTALL_DIR}/bin/scripts COMPONENT corbalib)
endforeach()
- install(PROGRAMS ${ORB_ROOT}/bin/${ARCH_NAME}/omniidl.exe DESTINATION ${ORB_INSTALL_DIR}/bin/${ARCH_NAME})
- install(PROGRAMS ${ORB_ROOT}/bin/${ARCH_NAME}/omniNames.exe DESTINATION ${ORB_INSTALL_DIR}/bin/${ARCH_NAME})
+ install(PROGRAMS ${ORB_ROOT}/bin/${ARCH_NAME}/omniidl.exe DESTINATION ${ORB_INSTALL_DIR}/bin/${ARCH_NAME} COMPONENT corbalib)
+ install(PROGRAMS ${ORB_ROOT}/bin/${ARCH_NAME}/omniNames.exe DESTINATION ${ORB_INSTALL_DIR}/bin/${ARCH_NAME} COMPONENT corbalib)
#install(FILES ${OMNIORB_HEADERFILES} DESTINATION ${ORB_INSTALL_DIR}/include)
@@ -410,9 +414,9 @@
set(ORB_INSTALL_DIR ${OPENRTM_VERSION}/ACE/${RTM_VC_VER}/)
foreach(library ${ORB_LIBRARIES1})
if((NOT (${library} STREQUAL "optimized")) AND (NOT (${library} STREQUAL "debug")))
- install(PROGRAMS "${ORB_LINK_DIR}/${library}.dll" DESTINATION ${ORB_INSTALL_DIR}/bin/)
- #install(PROGRAMS "${ORB_LINK_DIR}/${library}.pdb" DESTINATION ${ORB_INSTALL_DIR}/bin/)
- install(PROGRAMS "${ORB_LINK_DIR}/${library}.lib" DESTINATION ${ORB_INSTALL_DIR}/lib/)
+ install(PROGRAMS "${ORB_LINK_DIR}/${library}.dll" DESTINATION ${ORB_INSTALL_DIR}/bin/ COMPONENT corbalib)
+ #install(PROGRAMS "${ORB_LINK_DIR}/${library}.pdb" DESTINATION ${ORB_INSTALL_DIR}/bin/ COMPONENT corbalib)
+ install(PROGRAMS "${ORB_LINK_DIR}/${library}.lib" DESTINATION ${ORB_INSTALL_DIR}/lib/ COMPONENT corbalib)
endif()
endforeach()
@@ -494,7 +498,7 @@
foreach(file_path ${ACE_HEADERFILES})
get_filename_component(dir_path "${file_path}" DIRECTORY)
string(REPLACE "${ORB_ROOT}/" "" file "${dir_path}")
- install(FILES ${file_path} DESTINATION ${ORB_INSTALL_DIR}/${file})
+ install(FILES ${file_path} DESTINATION ${ORB_INSTALL_DIR}/${file} COMPONENT corbalib)
endforeach()
@@ -506,7 +510,7 @@
foreach(file_path ${TAO_IDLFILES})
get_filename_component(dir_path "${file_path}" DIRECTORY)
string(REPLACE "${ORB_ROOT}/" "" file "${dir_path}")
- install(FILES ${file_path} DESTINATION ${ORB_INSTALL_DIR}/${file})
+ install(FILES ${file_path} DESTINATION ${ORB_INSTALL_DIR}/${file} COMPONENT corbalib)
endforeach()
@@ -595,5 +599,11 @@
endif(DOCUMENTS_ENABLE)
if(WIN32)
- install(FILES ${CMAKE_SOURCE_DIR}/win32/OpenRTM-aist/bin/rtm-naming.bat DESTINATION ${INSTALL_RTM_SCRIPT_DIR})
+ install(FILES ${CMAKE_SOURCE_DIR}/win32/OpenRTM-aist/bin/rtm-naming.bat DESTINATION ${INSTALL_RTM_SCRIPT_DIR} COMPONENT utils)
endif(WIN32)
+
+
+CONFIGURE_FILE ("${PROJECT_SOURCE_DIR}/uninstall_target.cmake.in"
+ "${PROJECT_BINARY_DIR}/uninstall_target.cmake" IMMEDIATE @ONLY)
+ADD_CUSTOM_TARGET (uninstall "${CMAKE_COMMAND}" -P
+ "${PROJECT_BINARY_DIR}/uninstall_target.cmake")
Modified: trunk/OpenRTM-aist/docs/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/docs/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/docs/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -65,10 +65,10 @@
add_dependencies(${RTM_PROJECT_NAME} ClassReference-en)
-install(DIRECTORY IDLReference DESTINATION ${INSTALL_RTM_DOC_DIR}/idl)
-install(DIRECTORY ClassReference DESTINATION ${INSTALL_RTM_DOC_DIR}/c++)
-install(DIRECTORY IDLReference-en DESTINATION ${INSTALL_RTM_DOC_DIR}/idl)
-install(DIRECTORY ClassReference-en DESTINATION ${INSTALL_RTM_DOC_DIR}/c++)
+install(DIRECTORY IDLReference DESTINATION ${INSTALL_RTM_DOC_DIR}/idl COMPONENT documentation)
+install(DIRECTORY ClassReference DESTINATION ${INSTALL_RTM_DOC_DIR}/c++ COMPONENT documentation)
+install(DIRECTORY IDLReference-en DESTINATION ${INSTALL_RTM_DOC_DIR}/idl COMPONENT documentation)
+install(DIRECTORY ClassReference-en DESTINATION ${INSTALL_RTM_DOC_DIR}/c++ COMPONENT documentation)
Modified: trunk/OpenRTM-aist/etc/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/etc/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/etc/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -2,5 +2,8 @@
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/rtc.conf.sample DESTINATION ${INSTALL_RTM_ETC_DIR})
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tao_udp/svc.conf DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_udp)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/rtc.conf.sample DESTINATION ${INSTALL_RTM_ETC_DIR} COMPONENT ext)
+
+if(CORBA STREQUAL "TAO")
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tao_udp/svc.conf DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_udp COMPONENT ext)
+endif()
Modified: trunk/OpenRTM-aist/examples/Analyzer/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/Analyzer/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/examples/Analyzer/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -29,7 +29,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -51,13 +52,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Analyzer)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Analyzer COMPONENT sources)
endif()
@@ -87,7 +90,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -106,13 +110,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Analyzer)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Analyzer COMPONENT sources)
endif()
Modified: trunk/OpenRTM-aist/examples/AutoTest/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/AutoTest/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/examples/AutoTest/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -51,7 +51,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -72,13 +73,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/AutoTest)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/AutoTest COMPONENT sources)
endif()
@@ -112,7 +115,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -133,13 +137,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/AutoTest)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/AutoTest COMPONENT sources)
endif()
Modified: trunk/OpenRTM-aist/examples/Composite/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/Composite/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/examples/Composite/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -27,9 +27,10 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
-install(FILES ${srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Composite)
+install(FILES ${srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Composite COMPONENT sources)
if(VXWORKS)
@@ -62,7 +63,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -81,13 +83,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Composite)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Composite COMPONENT sources)
endif()
@@ -117,7 +121,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -136,13 +141,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Composite)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Composite COMPONENT sources)
endif()
@@ -172,7 +179,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -191,13 +199,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Composite)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Composite COMPONENT sources)
endif()
@@ -211,9 +221,9 @@
endif(VXWORKS)
-install(FILES composite.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+install(FILES composite.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR} COMPONENT examples)
if(UNIX)
- install(FILES rtc.composite.linux.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(FILES rtc.composite.linux.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR} COMPONENT examples)
elseif(WIN32)
- install(FILES rtc_win32.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(FILES rtc_win32.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR} COMPONENT examples)
endif()
Modified: trunk/OpenRTM-aist/examples/ConfigSample/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/ConfigSample/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/examples/ConfigSample/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -27,7 +27,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -48,13 +49,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/ConfigSample)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/ConfigSample COMPONENT sources)
endif()
@@ -66,4 +69,4 @@
endif(RTP)
endif(VXWORKS)
-install(FILES configsample.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+install(FILES configsample.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR} COMPONENT examples)
Modified: trunk/OpenRTM-aist/examples/ExtTrigger/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/ExtTrigger/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/examples/ExtTrigger/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -27,7 +27,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -46,13 +47,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/ExtTrigger)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/ExtTrigger COMPONENT sources)
endif()
@@ -81,7 +84,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -100,13 +104,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/ExtTrigger)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/ExtTrigger COMPONENT sources)
endif()
@@ -144,9 +150,10 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
- install(FILES ${srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/ExtTrigger)
+ install(FILES ${srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/ExtTrigger COMPONENT sources)
endif()
Modified: trunk/OpenRTM-aist/examples/HelloWorld/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/HelloWorld/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/examples/HelloWorld/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -27,7 +27,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -46,13 +47,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/HelloRTWorld)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/HelloRTWorld COMPONENT sources)
endif()
Modified: trunk/OpenRTM-aist/examples/SeqIO/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/SeqIO/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/examples/SeqIO/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -29,7 +29,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -48,13 +49,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SeqIO)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SeqIO COMPONENT sources)
endif()
@@ -84,7 +87,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -103,13 +107,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SeqIO)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SeqIO COMPONENT sources)
endif()
Modified: trunk/OpenRTM-aist/examples/SimpleIO/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/SimpleIO/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/examples/SimpleIO/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -27,7 +27,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -46,13 +47,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SimpleIO)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SimpleIO COMPONENT sources)
endif()
@@ -83,7 +86,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -102,13 +106,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SimpleIO)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SimpleIO COMPONENT sources)
endif()
@@ -122,7 +128,7 @@
endif(VXWORKS)
-install(FILES rtc.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
-install(FILES consin.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
-install(FILES consout.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
-install(FILES component.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+install(FILES rtc.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR} COMPONENT examples)
+install(FILES consin.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR} COMPONENT examples)
+install(FILES consout.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR} COMPONENT examples)
+install(FILES component.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR} COMPONENT examples)
Modified: trunk/OpenRTM-aist/examples/SimpleService/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/SimpleService/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/examples/SimpleService/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -52,7 +52,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -73,13 +74,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SimpleService)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SimpleService COMPONENT sources)
endif()
@@ -118,7 +121,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -139,13 +143,17 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SimpleService)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SimpleService COMPONENT sources)
+ install(FILES ${idl_name}.idl DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SimpleService COMPONENT sources)
+
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-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/examples/StaticFsm/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -27,7 +27,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -46,13 +47,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/StaticFSM)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/StaticFSM COMPONENT sources)
endif()
@@ -83,7 +86,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -102,13 +106,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/StaticFSM)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/StaticFSM COMPONENT sources)
endif()
@@ -140,7 +146,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -159,13 +166,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/StaticFSM)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/StaticFSM COMPONENT sources)
endif()
Modified: trunk/OpenRTM-aist/examples/StringIO/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/StringIO/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/examples/StringIO/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -27,7 +27,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -46,13 +47,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/StringIO)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/StringIO COMPONENT sources)
endif()
@@ -82,7 +85,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -101,13 +105,15 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/StringIO)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/StringIO COMPONENT sources)
endif()
if(VXWORKS)
if(RTP)
Modified: trunk/OpenRTM-aist/examples/Templates/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/Templates/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/examples/Templates/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -2,7 +2,7 @@
file(GLOB XML_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.xml")
foreach(file_path ${XML_FILES})
- install(FILES ${file_path} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/templates)
+ install(FILES ${file_path} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/templates COMPONENT sources)
endforeach()
Modified: trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -29,7 +29,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -49,18 +50,20 @@
install(TARGETS ${target}Comp LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
+ COMPONENT examples)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ COMPONENT examples)
if(WIN32)
file(GLOB script_files "scripts/*")
- install(FILES ${script_files} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(FILES ${script_files} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR} COMPONENT sources)
else(WIN32)
endif(WIN32)
- install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Throughput)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Throughput COMPONENT sources)
endif()
Modified: trunk/OpenRTM-aist/src/ext/ec/artlinux/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/artlinux/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/src/ext/ec/artlinux/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -31,7 +31,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
- RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec)
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ COMPONENT ext)
else()
if(VXWORKS)
@@ -49,7 +50,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
- RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec)
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ COMPONENT ext)
endif()
Modified: trunk/OpenRTM-aist/src/ext/ec/logical_time/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/logical_time/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/src/ext/ec/logical_time/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -51,7 +51,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
- RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec)
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ COMPONENT ext)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -69,7 +70,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
- RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec)
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ COMPONENT ext)
endif()
Modified: trunk/OpenRTM-aist/src/ext/ec/rtpreempt/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/rtpreempt/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/src/ext/ec/rtpreempt/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -32,7 +32,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
- RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec)
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ COMPONENT ext)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -49,7 +50,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
- RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec)
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ COMPONENT ext)
endif()
Modified: trunk/OpenRTM-aist/src/ext/local_service/nameservice_file/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/local_service/nameservice_file/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/src/ext/local_service/nameservice_file/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -31,7 +31,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/local_service
ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/local_service
- RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/local_service)
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/local_service
+ COMPONENT ext)
else()
@@ -50,7 +51,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/local_service
ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/local_service
- RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/local_service)
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/local_service
+ COMPONENT ext)
endif()
Modified: trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -31,7 +31,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
- RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo)
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ COMPONENT ext)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -48,7 +49,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
- RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo)
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ COMPONENT ext)
endif()
Modified: trunk/OpenRTM-aist/src/ext/sdo/fsm4rtc_observer/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/fsm4rtc_observer/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/src/ext/sdo/fsm4rtc_observer/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -51,7 +51,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
- RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo)
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ COMPONENT ext)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -69,7 +70,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
- RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo)
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ COMPONENT ext)
endif()
Modified: trunk/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -51,7 +51,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
- RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo)
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ COMPONENT ext)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -70,7 +71,8 @@
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
- RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo)
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ COMPONENT ext)
endif()
Modified: trunk/OpenRTM-aist/src/ext/ssl/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/ssl/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/src/ext/ssl/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -49,22 +49,19 @@
set_target_properties(${target} PROPERTIES PREFIX "")
+install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ssl
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/ssl
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ssl
+ COMPONENT ext)
+
if(WIN32)
- 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)
+ install(PROGRAMS ${library} DESTINATION ${INSTALL_RTM_EXT_DIR}/ssl COMPONENT ssllibs)
endforeach()
- install(PROGRAMS ${OPENSSL_ROOT}/bin/openssl.exe DESTINATION ${INSTALL_RTM_EXT_DIR}/ssl)
+ install(PROGRAMS ${OPENSSL_ROOT}/bin/openssl.exe DESTINATION ${INSTALL_RTM_EXT_DIR}/ssl COMPONENT ssllibs)
else(WIN32)
- 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-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -167,7 +167,8 @@
add_library(${COIL_PROJECT_NAME} STATIC ${coil_srcs} )
install(TARGETS ${COIL_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_BIN_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR}
+ COMPONENT coil)
else(VXWORKS)
add_library(${COIL_PROJECT_NAME} SHARED ${coil_srcs} )
set_target_properties(${COIL_PROJECT_NAME} PROPERTIES DEBUG_POSTFIX d)
@@ -175,7 +176,8 @@
if(UNIX)
install(TARGETS ${COIL_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR}
+ COMPONENT coil)
elseif(WIN32)
set_source_files_properties(${DEF_FILE_NAME} PROPERTIES GENERATED 1)
add_dependencies(${COIL_PROJECT_NAME} ${COIL_PROJECT_NAME}_TGT)
@@ -182,20 +184,21 @@
add_dependencies(${COIL_PROJECT_NAME} ${COIL_PROJECT_NAME}_static)
install(TARGETS ${COIL_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR}
+ COMPONENT coil)
endif()
endif(VXWORKS)
-install(FILES ${coil_headers} DESTINATION ${INSTALL_COIL_INCLUDE_DIR}/coil)
+install(FILES ${coil_headers} DESTINATION ${INSTALL_COIL_INCLUDE_DIR}/coil COMPONENT headers)
#add_executable(coil ${coil_srcs} )
-install(FILES ${CMAKE_SOURCE_DIR}/build/makedeffile.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR})
-install(FILES ${CMAKE_SOURCE_DIR}/build/setuptest.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR})
-install(FILES ${CMAKE_SOURCE_DIR}/build/slntool.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR})
-install(FILES ${CMAKE_SOURCE_DIR}/build/uuid.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR})
-install(FILES ${CMAKE_SOURCE_DIR}/build/vcprojtool.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR})
-install(FILES ${CMAKE_SOURCE_DIR}/build/vcxprojtool.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR})
-install(FILES ${CMAKE_SOURCE_DIR}/build/yat.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR})
+install(FILES ${CMAKE_SOURCE_DIR}/build/makedeffile.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR} COMPONENT scripts)
+install(FILES ${CMAKE_SOURCE_DIR}/build/setuptest.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR} COMPONENT scripts)
+install(FILES ${CMAKE_SOURCE_DIR}/build/slntool.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR} COMPONENT scripts)
+install(FILES ${CMAKE_SOURCE_DIR}/build/uuid.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR} COMPONENT scripts)
+install(FILES ${CMAKE_SOURCE_DIR}/build/vcprojtool.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR} COMPONENT scripts)
+install(FILES ${CMAKE_SOURCE_DIR}/build/vcxprojtool.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR} COMPONENT scripts)
+install(FILES ${CMAKE_SOURCE_DIR}/build/yat.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR} COMPONENT scripts)
add_subdirectory(utils)
Modified: trunk/OpenRTM-aist/src/lib/coil/utils/coil-config/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/utils/coil-config/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/src/lib/coil/utils/coil-config/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -1,7 +1,7 @@
cmake_minimum_required (VERSION 2.6)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/coil-config.in ${PROJECT_BINARY_DIR}/coil-config @ONLY)
-install(FILES ${PROJECT_BINARY_DIR}/coil-config DESTINATION ${INSTALL_RTM_BIN_DIR})
+install(FILES ${PROJECT_BINARY_DIR}/coil-config DESTINATION ${INSTALL_RTM_BIN_DIR} COMPONENT utils)
@@ -16,4 +16,4 @@
set(COIL_VERSION ${RTM_VERSION})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcoil_cmake.pc.in ${PROJECT_BINARY_DIR}/libcoil.pc @ONLY)
-install(FILES ${PROJECT_BINARY_DIR}/libcoil.pc DESTINATION ${INSTALL_RTM_LIB_DIR}/pkgconfig)
+install(FILES ${PROJECT_BINARY_DIR}/libcoil.pc DESTINATION ${INSTALL_RTM_LIB_DIR}/pkgconfig COMPONENT utils)
Modified: trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -398,7 +398,7 @@
include_directories(${CMAKE_SOURCE_DIR}/src)
#set(rtm_headers ${rtm_headers} ${CMAKE_SOURCE_DIR}/src/ext/sdo/observer/ComponentObserverConsumer.h)
set(rtm_srcs ${rtm_srcs} ${CMAKE_SOURCE_DIR}/src/ext/sdo/observer/ComponentObserverConsumer.cpp )
- install(FILES ${CMAKE_SOURCE_DIR}/src/ext/sdo/observer/ComponentObserverConsumer.h DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo/observer)
+ install(FILES ${CMAKE_SOURCE_DIR}/src/ext/sdo/observer/ComponentObserverConsumer.h DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo/observer COMPONENT headers)
endif(OBSERVER_ENABLE)
@@ -468,7 +468,8 @@
add_library(${RTM_PROJECT_NAME} STATIC ${rtm_srcs})
install(TARGETS ${RTM_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_BIN_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR}
+ COMPONENT openrtm)
else(VXWORKS)
@@ -484,7 +485,8 @@
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}
ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR}
+ COMPONENT openrtm)
elseif(WIN32)
target_link_libraries(${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTM_LINKER_OPTION})
add_dependencies(${RTM_PROJECT_NAME} ALL_IDL_TGT)
@@ -493,12 +495,13 @@
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}
- RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR}
+ COMPONENT openrtm)
endif()
endif(VXWORKS)
-install(FILES ${rtm_headers} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm)
+install(FILES ${rtm_headers} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm COMPONENT headers)
Modified: trunk/OpenRTM-aist/src/lib/rtm/ext/rtmCamera/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ext/rtmCamera/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/rtmCamera/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -117,7 +117,8 @@
add_library(${target} SHARED ${ALL_IDL_SRCS})
install(TARGETS ${RTM_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_BIN_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR}
+ COMPONENT ext)
else(VXWORKS)
add_library(${target} SHARED ${ALL_IDL_SRCS})
set_target_properties(${target} PROPERTIES DEBUG_POSTFIX d)
@@ -125,7 +126,8 @@
if(UNIX)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR}
+ COMPONENT ext)
elseif(WIN32)
set_source_files_properties(${DEF_FILE_NAME} PROPERTIES GENERATED 1)
add_dependencies(${target} ${target}_TGT)
@@ -132,7 +134,8 @@
add_dependencies(${target} ${target}_static)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR}
+ COMPONENT ext)
endif()
endif(VXWORKS)
@@ -148,7 +151,7 @@
add_dependencies(${target} ${RTCSKEL_PROJECT_NAME})
-install(FILES ${ALL_IDL_FILES} ${ALL_IDL_HEADERS} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/ext)
+install(FILES ${ALL_IDL_FILES} ${ALL_IDL_HEADERS} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/ext COMPONENT ext)
foreach(idl ${idls})
if(CORBA STREQUAL "ORBexpress")
@@ -163,6 +166,6 @@
endif()
endforeach(idl)
-install(FILES ${SKEL_STUB_HEADER_FILES} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/ext)
+install(FILES ${SKEL_STUB_HEADER_FILES} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/ext COMPONENT ext)
Modified: trunk/OpenRTM-aist/src/lib/rtm/ext/rtmManipulator/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ext/rtmManipulator/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/rtmManipulator/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -121,7 +121,8 @@
add_library(${target} SHARED ${ALL_IDL_SRCS})
install(TARGETS ${RTM_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_BIN_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_BIN_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR}
+ COMPONENT ext)
else(VXWORKS)
add_library(${target} SHARED ${ALL_IDL_SRCS})
set_target_properties(${target} PROPERTIES DEBUG_POSTFIX d)
@@ -129,7 +130,8 @@
if(UNIX)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR}
+ COMPONENT ext)
elseif(WIN32)
set_source_files_properties(${DEF_FILE_NAME} PROPERTIES GENERATED 1)
add_dependencies(${target} ${target}_TGT)
@@ -136,7 +138,8 @@
add_dependencies(${target} ${target}_static)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR}
+ COMPONENT ext)
endif()
endif(VXWORKS)
@@ -160,7 +163,7 @@
-install(FILES ${ALL_IDL_FILES} ${ALL_IDL_HEADERS} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/ext)
+install(FILES ${ALL_IDL_FILES} ${ALL_IDL_HEADERS} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/ext COMPONENT ext)
@@ -177,4 +180,4 @@
endif()
endforeach(idl)
-install(FILES ${SKEL_STUB_HEADER_FILES} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/ext)
+install(FILES ${SKEL_STUB_HEADER_FILES} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/ext COMPONENT ext)
Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -106,7 +106,8 @@
add_dependencies(${RTCSKEL_PROJECT_NAME} ALL_IDL_TGT)
-install(FILES ${ALL_IDL_FILES} ${ALL_IDL_HEADERS} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/idl)
+install(FILES ${ALL_IDL_FILES} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/idl COMPONENT idl)
+install(FILES ${ALL_IDL_HEADERS} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/idl COMPONENT headers)
@@ -124,7 +125,7 @@
endforeach(idl)
-install(FILES ${SKEL_STUB_HEADER_FILES} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/idl)
+install(FILES ${SKEL_STUB_HEADER_FILES} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/idl COMPONENT headers)
Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/device_interfaces/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/device_interfaces/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/device_interfaces/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -2,7 +2,7 @@
file(GLOB IDL_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.idl")
foreach(file_path ${IDL_FILES})
- install(FILES ${file_path} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/idl/device_interfaces)
+ install(FILES ${file_path} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/idl/device_interfaces COMPONENT ext)
endforeach()
Modified: trunk/OpenRTM-aist/utils/cmake/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/cmake/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/utils/cmake/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -30,21 +30,23 @@
elseif(UNIX)
if(CORBA STREQUAL "ORBexpress")
elseif(CORBA STREQUAL "omniORB")
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OpenRTMConfig_Linux.cmake.in ${PROJECT_BINARY_DIR}/cmake/OpenRTMConfig.cmake @ONLY)
- install(FILES ${PROJECT_BINARY_DIR}/cmake/OpenRTMConfig.cmake DESTINATION ${INSTALL_RTM_CMAKE_DIR})
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OpenRTMConfig_omniORB_Linux.cmake.in ${PROJECT_BINARY_DIR}/cmake/OpenRTMConfig.cmake @ONLY)
+ install(FILES ${PROJECT_BINARY_DIR}/cmake/OpenRTMConfig.cmake DESTINATION ${INSTALL_RTM_CMAKE_DIR} COMPONENT cmakefiles)
elseif(CORBA STREQUAL "TAO")
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OpenRTMConfig_TAO_Linux.cmake.in ${PROJECT_BINARY_DIR}/cmake/OpenRTMConfig.cmake @ONLY)
+ install(FILES ${PROJECT_BINARY_DIR}/cmake/OpenRTMConfig.cmake DESTINATION ${INSTALL_RTM_CMAKE_DIR} COMPONENT cmakefiles)
endif()
elseif(MSVC)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OpenRTMConfig.cmake.in ${PROJECT_BINARY_DIR}/OpenRTMConfig.cmake @ONLY)
- install(FILES ${PROJECT_BINARY_DIR}/OpenRTMConfig.cmake DESTINATION ${INSTALL_RTM_CMAKE_DIR})
+ install(FILES ${PROJECT_BINARY_DIR}/OpenRTMConfig.cmake DESTINATION ${INSTALL_RTM_CMAKE_DIR} COMPONENT cmakefiles)
if(CORBA STREQUAL "ORBexpress")
elseif(CORBA STREQUAL "omniORB")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OpenRTMConfig_omniORB.cmake.in ${PROJECT_BINARY_DIR}/cmake/OpenRTMConfig.cmake @ONLY)
- install(FILES ${PROJECT_BINARY_DIR}/cmake/OpenRTMConfig.cmake DESTINATION ${INSTALL_RTM_BIN_DIR})
+ install(FILES ${PROJECT_BINARY_DIR}/cmake/OpenRTMConfig.cmake DESTINATION ${INSTALL_RTM_BIN_DIR} COMPONENT cmakefiles)
elseif(CORBA STREQUAL "TAO")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OpenRTMConfig_TAO.cmake.in ${PROJECT_BINARY_DIR}/cmake/OpenRTMConfig.cmake @ONLY)
- install(FILES ${PROJECT_BINARY_DIR}/cmake/OpenRTMConfig.cmake DESTINATION ${INSTALL_RTM_BIN_DIR})
+ install(FILES ${PROJECT_BINARY_DIR}/cmake/OpenRTMConfig.cmake DESTINATION ${INSTALL_RTM_BIN_DIR} COMPONENT cmakefiles)
endif()
# configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OpenRTMFind_win.cmake.in ${PROJECT_BINARY_DIR}/OpenRTMFind.cmake @ONLY)
Modified: trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig_TAO.cmake.in
===================================================================
--- trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig_TAO.cmake.in 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig_TAO.cmake.in 2018-11-16 01:08:23 UTC (rev 3445)
@@ -93,7 +93,7 @@
set(OPENRTM_IDL_WRAPPER rtm-skelwrapper.py)
set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="";--skel-suffix=Skel;--stub-suffix=Stub)
set(OPENRTM_IDLC tao_idl)
-set(OPENRTM_IDLFLAGS -as -DTAO_IDL -I${TAO_DIR}/TAO -I${OPENRTM_DIR}/rtm/idl)
+set(OPENRTM_IDLFLAGS -as -DTAO_IDL -I${OMNIORB_DIR}/TAO -I${OPENRTM_DIR}/rtm/idl)
message(STATUS "OpenRTM-aist configuration done")
Modified: trunk/OpenRTM-aist/utils/rtc-template/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtc-template/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/utils/rtc-template/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -2,7 +2,7 @@
if(UNIX)
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/rtc-template DESTINATION ${INSTALL_RTM_BIN_DIR})
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/rtc-template DESTINATION ${INSTALL_RTM_BIN_DIR} COMPONENT utils)
elseif(MSVC)
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/rtc-template DESTINATION ${INSTALL_RTM_SCRIPT_DIR})
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/rtc-template DESTINATION ${INSTALL_RTM_SCRIPT_DIR} COMPONENT utils)
endif(UNIX)
\ No newline at end of file
Modified: trunk/OpenRTM-aist/utils/rtcd/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtcd/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/utils/rtcd/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -46,9 +46,11 @@
if(WIN32)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR}
+ COMPONENT utils)
else(WIN32)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR}
+ COMPONENT utils)
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-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/utils/rtcprof/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -56,9 +56,11 @@
if(WIN32)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR}
+ COMPONENT utils)
else(WIN32)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR}
+ COMPONENT utils)
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-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/utils/rtcsh/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -34,9 +34,11 @@
if(WIN32)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR}
+ COMPONENT utils)
else(WIN32)
install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
- RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
+ RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR}
+ COMPONENT utils)
endif(WIN32)
Modified: trunk/OpenRTM-aist/utils/rtm-config/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtm-config/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/utils/rtm-config/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -23,8 +23,8 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rtm-config.in ${PROJECT_BINARY_DIR}/rtm-config @ONLY)
-install(FILES ${PROJECT_BINARY_DIR}/rtm-config DESTINATION ${INSTALL_RTM_BIN_DIR})
+install(FILES ${PROJECT_BINARY_DIR}/rtm-config DESTINATION ${INSTALL_RTM_BIN_DIR} COMPONENT utils)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/openrtm-aist_cmake.pc.in ${PROJECT_BINARY_DIR}/openrtm-aist.pc @ONLY)
-install(FILES ${PROJECT_BINARY_DIR}/openrtm-aist.pc DESTINATION ${INSTALL_RTM_LIB_DIR}/pkgconfig)
+install(FILES ${PROJECT_BINARY_DIR}/openrtm-aist.pc DESTINATION ${INSTALL_RTM_LIB_DIR}/pkgconfig COMPONENT utils)
Modified: trunk/OpenRTM-aist/utils/rtm-naming/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtm-naming/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/utils/rtm-naming/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -3,4 +3,4 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rtm-naming.in ${PROJECT_BINARY_DIR}/rtm-naming @ONLY)
-install(FILES ${PROJECT_BINARY_DIR}/rtm-naming DESTINATION ${INSTALL_RTM_BIN_DIR})
+install(FILES ${PROJECT_BINARY_DIR}/rtm-naming DESTINATION ${INSTALL_RTM_BIN_DIR} COMPONENT utils)
Modified: trunk/OpenRTM-aist/utils/rtm-skelwrapper/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtm-skelwrapper/CMakeLists.txt 2018-11-15 06:13:49 UTC (rev 3444)
+++ trunk/OpenRTM-aist/utils/rtm-skelwrapper/CMakeLists.txt 2018-11-16 01:08:23 UTC (rev 3445)
@@ -2,11 +2,11 @@
if(UNIX)
- install(FILES rtm-skelwrapper DESTINATION ${INSTALL_RTM_BIN_DIR})
- install(FILES skel_wrapper.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR})
+ install(FILES rtm-skelwrapper DESTINATION ${INSTALL_RTM_BIN_DIR} COMPONENT utils)
+ install(FILES skel_wrapper.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR} COMPONENT utils)
elseif(MSVC)
configure_file(rtm-skelwrapper ${PROJECT_BINARY_DIR}/rtm-skelwrapper.py COPYONLY)
- install(FILES ${PROJECT_BINARY_DIR}/rtm-skelwrapper.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR})
+ install(FILES ${PROJECT_BINARY_DIR}/rtm-skelwrapper.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR} COMPONENT utils)
endif(UNIX)
openrtm-commit メーリングリストの案内