[openrtm-commit:03364] r3437 - in trunk/OpenRTM-aist: . etc examples 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 src/lib/coil/utils/coil-config src/lib/rtm/ext/rtmCamera src/lib/rtm/ext/rtmManipulator src/lib/rtm/idl src/lib/rtm/idl/device_interfaces utils utils/cmake utils/rtc-template utils/rtm-config utils/rtm-naming utils/rtm-skelwrapper
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 11月 7日 (水) 17:10:49 JST
Author: miyamoto
Date: 2018-11-07 17:10:49 +0900 (Wed, 07 Nov 2018)
New Revision: 3437
Added:
trunk/OpenRTM-aist/etc/CMakeLists.txt
trunk/OpenRTM-aist/examples/Templates/CMakeLists.txt
trunk/OpenRTM-aist/src/lib/coil/utils/CMakeLists.txt
trunk/OpenRTM-aist/src/lib/coil/utils/coil-config/CMakeLists.txt
trunk/OpenRTM-aist/src/lib/coil/utils/coil-config/libcoil_cmake.pc.in
trunk/OpenRTM-aist/src/lib/rtm/idl/device_interfaces/CMakeLists.txt
trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig_Linux.cmake.in
trunk/OpenRTM-aist/utils/rtc-template/CMakeLists.txt
trunk/OpenRTM-aist/utils/rtm-config/CMakeLists.txt
trunk/OpenRTM-aist/utils/rtm-config/openrtm-aist_cmake.pc.in
trunk/OpenRTM-aist/utils/rtm-config/rtm-config_cmake.in
Modified:
trunk/OpenRTM-aist/CMakeLists.txt
trunk/OpenRTM-aist/examples/Analyzer/CMakeLists.txt
trunk/OpenRTM-aist/examples/AutoTest/CMakeLists.txt
trunk/OpenRTM-aist/examples/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/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/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/utils/CMakeLists.txt
trunk/OpenRTM-aist/utils/cmake/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-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -109,20 +109,27 @@
set(INSTALL_RTM_BIN_DIR ${OPENRTM_VERSION}/bin/${RTM_VC_VER}/)
set(INSTALL_RTM_INCLUDE_DIR ${OPENRTM_VERSION}/)
+ set(INSTALL_COIL_INCLUDE_DIR ${OPENRTM_VERSION}/)
set(INSTALL_RTM_LIB_DIR ${OPENRTM_VERSION}/bin/${RTM_VC_VER}/)
set(INSTALL_RTM_EXAMPLE_DIR ${OPENRTM_VERSION}/Components/C++/Examples/${RTM_VC_VER}/)
+ set(INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR ${INSTALL_RTM_EXAMPLE_DIR})
set(INSTALL_RTM_DOC_DIR ${OPENRTM_VERSION}/docs/)
set(INSTALL_RTM_EXT_DIR ${OPENRTM_VERSION}/ext/)
set(INSTALL_RTM_CMAKE_DIR ${OPENRTM_VERSION}/cmake/)
+ set(INSTALL_RTM_ETC_DIR ${OPENRTM_VERSION}/ext/)
else(MSVC)
- set(INSTALL_RTM_SCRIPT_DIR bin)
+ set(INSTALL_RTM_SCRIPT_DIR lib/openrtm-${RTM_MAJOR_VERSION}.${RTM_MINOR_VERSION}/py_helper)
set(INSTALL_RTM_BIN_DIR bin)
- set(INSTALL_RTM_INCLUDE_DIR include)
+ set(INSTALL_RTM_INCLUDE_DIR include/openrtm-${RTM_MAJOR_VERSION}.${RTM_MINOR_VERSION})
+ set(INSTALL_COIL_INCLUDE_DIR include/coil-${RTM_MAJOR_VERSION}.${RTM_MINOR_VERSION})
set(INSTALL_RTM_LIB_DIR lib)
- set(INSTALL_RTM_EXAMPLE_DIR examples)
- set(INSTALL_RTM_DOC_DIR docs)
- set(INSTALL_RTM_EXT_DIR ext)
- set(INSTALL_RTM_CMAKE_DIR cmake)
+ set(INSTALL_RTM_EXAMPLE_DIR share/openrtm-${RTM_MAJOR_VERSION}.${RTM_MINOR_VERSION}/components/c++/examples)
+ set(INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR ${INSTALL_RTM_EXAMPLE_DIR}/rtc)
+ set(INSTALL_RTM_DOC_DIR share/openrtm-${RTM_MAJOR_VERSION}.${RTM_MINOR_VERSION}/doc)
+ set(INSTALL_RTM_EXT_DIR lib/openrtm-${RTM_MAJOR_VERSION}.${RTM_MINOR_VERSION})
+ set(INSTALL_RTM_CMAKE_DIR lib/openrtm-${RTM_MAJOR_VERSION}.${RTM_MINOR_VERSION}/cmake)
+ set(INSTALL_RTM_ETC_DIR etc)
+ set(INSTALL_RTM_SHARE_DIR share)
endif(MSVC)
@@ -339,7 +346,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})
endforeach()
@@ -579,6 +586,7 @@
add_subdirectory(src)
add_subdirectory(examples)
add_subdirectory(utils)
+add_subdirectory(etc)
set(DOCUMENTS_ENABLE ${DOCUMENTS_ENABLE} CACHE BOOL "set DOCUMENTS_ENABLE")
Added: trunk/OpenRTM-aist/etc/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/etc/CMakeLists.txt (rev 0)
+++ trunk/OpenRTM-aist/etc/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -0,0 +1,6 @@
+cmake_minimum_required (VERSION 2.6)
+
+
+
+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)
Modified: trunk/OpenRTM-aist/examples/Analyzer/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/Analyzer/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/examples/Analyzer/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -53,10 +53,11 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Analyzer)
endif()
@@ -107,10 +108,12 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Analyzer)
+
endif()
Modified: trunk/OpenRTM-aist/examples/AutoTest/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/AutoTest/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/examples/AutoTest/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -74,10 +74,12 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/AutoTest)
+
endif()
set_source_files_properties(${${idl_name}_SKEL} PROPERTIES GENERATED 1)
@@ -133,10 +135,12 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/AutoTest)
+
endif()
set_source_files_properties(${${idl_name}_STUB} PROPERTIES GENERATED 1)
Modified: trunk/OpenRTM-aist/examples/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/examples/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -11,3 +11,5 @@
add_subdirectory(Throughput)
add_subdirectory(StaticFsm)
+
+add_subdirectory(Templates)
Modified: trunk/OpenRTM-aist/examples/Composite/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/Composite/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/examples/Composite/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -29,7 +29,9 @@
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+install(FILES ${srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Composite)
+
if(VXWORKS)
if(RTP)
set_target_properties(${target} PROPERTIES SUFFIX ".vxe")
@@ -81,10 +83,12 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Composite)
+
endif()
@@ -134,10 +138,12 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Composite)
+
endif()
@@ -187,10 +193,12 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Composite)
+
endif()
@@ -201,3 +209,11 @@
set_target_properties(${target} PROPERTIES SUFFIX ".out")
endif(RTP)
endif(VXWORKS)
+
+
+install(FILES composite.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+if(UNIX)
+ install(FILES rtc.composite.linux.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+elseif(WIN32)
+ install(FILES rtc_win32.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+endif()
Modified: trunk/OpenRTM-aist/examples/ConfigSample/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/ConfigSample/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/examples/ConfigSample/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -50,9 +50,11 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/ConfigSample)
endif()
@@ -63,3 +65,5 @@
set_target_properties(${target} PROPERTIES SUFFIX ".out")
endif(RTP)
endif(VXWORKS)
+
+install(FILES configsample.conf DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
Modified: trunk/OpenRTM-aist/examples/ExtTrigger/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/ExtTrigger/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/examples/ExtTrigger/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -48,10 +48,12 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/ExtTrigger)
+
endif()
if(VXWORKS)
@@ -100,9 +102,11 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/ExtTrigger)
endif()
@@ -142,6 +146,8 @@
ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}
RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+ install(FILES ${srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/ExtTrigger)
+
endif()
Modified: trunk/OpenRTM-aist/examples/HelloWorld/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/HelloWorld/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/examples/HelloWorld/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -48,9 +48,11 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/HelloRTWorld)
endif()
Modified: trunk/OpenRTM-aist/examples/SeqIO/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/SeqIO/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/examples/SeqIO/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -50,10 +50,12 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SeqIO)
+
endif()
if(VXWORKS)
@@ -103,10 +105,12 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SeqIO)
+
endif()
Modified: trunk/OpenRTM-aist/examples/SimpleIO/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/SimpleIO/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/examples/SimpleIO/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -48,10 +48,12 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SimpleIO)
+
endif()
if(VXWORKS)
@@ -102,10 +104,12 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SimpleIO)
+
endif()
@@ -116,3 +120,9 @@
set_target_properties(${target} PROPERTIES SUFFIX ".out")
endif(RTP)
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})
Modified: trunk/OpenRTM-aist/examples/SimpleService/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/SimpleService/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/examples/SimpleService/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -75,10 +75,12 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SimpleService)
+
endif()
@@ -139,9 +141,11 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/SimpleService)
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-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/examples/StaticFsm/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -48,10 +48,12 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/StaticFSM)
+
endif()
if(VXWORKS)
@@ -102,10 +104,12 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/StaticFSM)
+
endif()
@@ -157,10 +161,12 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/StaticFSM)
+
endif()
Modified: trunk/OpenRTM-aist/examples/StringIO/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/StringIO/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/examples/StringIO/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -48,10 +48,12 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/StringIO)
+
endif()
@@ -101,9 +103,11 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
+
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/StringIO)
endif()
if(VXWORKS)
if(RTP)
Added: trunk/OpenRTM-aist/examples/Templates/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/Templates/CMakeLists.txt (rev 0)
+++ trunk/OpenRTM-aist/examples/Templates/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -0,0 +1,8 @@
+cmake_minimum_required (VERSION 2.6)
+
+file(GLOB XML_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.xml")
+foreach(file_path ${XML_FILES})
+ install(FILES ${file_path} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/templates)
+endforeach()
+
+
Modified: trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -51,9 +51,9 @@
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})
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR})
if(WIN32)
file(GLOB script_files "scripts/*")
install(FILES ${script_files} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
@@ -60,6 +60,8 @@
else(WIN32)
endif(WIN32)
+ install(FILES ${standalone_srcs} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR}/src/Throughput)
+
endif()
Modified: trunk/OpenRTM-aist/src/ext/ec/artlinux/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/artlinux/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/src/ext/ec/artlinux/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -29,7 +29,10 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec/artlinux)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec)
+
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -44,11 +47,9 @@
set_target_properties(${target} PROPERTIES PREFIX "")
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec/artlinux)
- endif(WIN32)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec)
endif()
Modified: trunk/OpenRTM-aist/src/ext/ec/logical_time/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/logical_time/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/src/ext/ec/logical_time/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -49,7 +49,9 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
add_dependencies(${target} ${idl_name}_TGT)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec/logical_time)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -65,11 +67,9 @@
set_target_properties(${target} PROPERTIES PREFIX "")
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec/logical_time)
- endif(WIN32)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec)
endif()
Modified: trunk/OpenRTM-aist/src/ext/ec/rtpreempt/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/rtpreempt/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/src/ext/ec/rtpreempt/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -30,7 +30,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec/rtpreempt)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -45,11 +47,9 @@
set_target_properties(${target} PROPERTIES PREFIX "")
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec/rtpreempt)
- endif(WIN32)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/ec
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec)
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-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/src/ext/local_service/nameservice_file/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -29,7 +29,11 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/local_service/nameservice_file)
+ 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)
+
+
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -44,11 +48,9 @@
set_target_properties(${target} PROPERTIES PREFIX "")
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/local_service/nameservice_file)
- endif(WIN32)
+ 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)
endif()
Modified: trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -29,7 +29,9 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo/extended_fsm)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -44,11 +46,9 @@
set_target_properties(${target} PROPERTIES PREFIX "")
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo/extended_fsm)
- endif(WIN32)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo)
endif()
Modified: trunk/OpenRTM-aist/src/ext/sdo/fsm4rtc_observer/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/fsm4rtc_observer/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/src/ext/sdo/fsm4rtc_observer/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -49,7 +49,9 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
add_dependencies(${target} ${idl_name}_RTC_TGT)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo/fsm4rtc_observer)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -65,11 +67,9 @@
set_target_properties(${target} PROPERTIES PREFIX "")
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo/fsm4rtc_observer)
- endif(WIN32)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo)
endif()
Modified: trunk/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -49,7 +49,9 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
add_dependencies(${target} ${idl_name}_TGT)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo/logger)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -65,11 +67,10 @@
set_target_properties(${target} PROPERTIES PREFIX "")
- if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
- else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo/logger)
- endif(WIN32)
+
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ ARCHIVE DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo
+ RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo)
endif()
Modified: trunk/OpenRTM-aist/src/ext/ssl/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/ssl/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/src/ext/ssl/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -16,9 +16,14 @@
set(SSL_INCLUDE_DIR ${OPENSSL_ROOT}/include)
set(SSL_LINK_DIR ${OPENSSL_ROOT}/lib)
-set(SSL_LIBRARIES libssl libcrypto)
+if(WIN32)
+ set(SSL_LIBRARIES libssl libcrypto)
+else(WIN32)
+ set(SSL_LIBRARIES ssl crypto)
+endif(WIN32)
+
link_directories(${ORB_LINK_DIR} ${SSL_LINK_DIR})
include_directories(
${RTM_INCLUDE_DIR}
Modified: trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -185,7 +185,7 @@
RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR})
endif()
endif(VXWORKS)
-install(FILES ${coil_headers} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/coil)
+install(FILES ${coil_headers} DESTINATION ${INSTALL_COIL_INCLUDE_DIR}/coil)
#add_executable(coil ${coil_srcs} )
@@ -197,3 +197,5 @@
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})
+add_subdirectory(utils)
+
Added: trunk/OpenRTM-aist/src/lib/coil/utils/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/utils/CMakeLists.txt (rev 0)
+++ trunk/OpenRTM-aist/src/lib/coil/utils/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -0,0 +1,5 @@
+cmake_minimum_required (VERSION 2.6)
+
+if(UNIX)
+ add_subdirectory(coil-config)
+endif(UNIX)
Added: trunk/OpenRTM-aist/src/lib/coil/utils/coil-config/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/utils/coil-config/CMakeLists.txt (rev 0)
+++ trunk/OpenRTM-aist/src/lib/coil/utils/coil-config/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -0,0 +1,19 @@
+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})
+
+
+
+set(INSTALL_COIL_DIR ${INSTALL_RTM_LIB_DIR}/coil-${RTM_MAJOR_VERSION}.${RTM_MINOR_VERSION})
+set(CXXFLAGS -Wall -fPIC -O2)
+
+set(LIBS -lpthread ${RTM_LINKER_OPTION} -l${COIL_PROJECT_NAME})
+
+set(PACKAGE coil)
+set(COIL_DESCRIPTION Common Operating-system Infrastructure Layer)
+set(COIL_LIBS ${COIL_PROJECT_NAME})
+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)
Added: trunk/OpenRTM-aist/src/lib/coil/utils/coil-config/libcoil_cmake.pc.in
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/utils/coil-config/libcoil_cmake.pc.in (rev 0)
+++ trunk/OpenRTM-aist/src/lib/coil/utils/coil-config/libcoil_cmake.pc.in 2018-11-07 08:10:49 UTC (rev 3437)
@@ -0,0 +1,18 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/@INSTALL_COIL_DIR@
+includedir=${prefix}/@INSTALL_RTM_LIB_DIR@
+coil_prefix=@prefix@
+coil_exec_prefix=@exec_prefix@
+coil_cxx=@CMAKE_CXX_COMPILER@
+coil_cflags= @CXXFLAGS@ -I${prefix}/@INSTALL_COIL_DIR@
+coil_libs=@RTM_LINKER_OPTION@ -L${prefix}/lib @LIBS@
+coil_libdir=@INSTALL_COIL_DIR@
+coil_version=@COIL_VERSION@
+
+Name: @PACKAGE@
+Description: @COIL_DESCRIPTION@
+Version: @COIL_VERSION@
+Requires:
+Libs: ${COIL_LIBS}
+Cflags: ${COIL_CFLAGS}
Modified: trunk/OpenRTM-aist/src/lib/rtm/ext/rtmCamera/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ext/rtmCamera/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/rtmCamera/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -1,8 +1,11 @@
cmake_minimum_required (VERSION 2.6)
+if(WIN32)
+ set(target rtmCamera${RTM_SHORT_VERSION}_${RTM_VC_VER})
+else(WIN32)
+ set(target rtmCamera)
+endif(WIN32)
-set(target rtmCamera${RTM_SHORT_VERSION}_${RTM_VC_VER})
-
project (${target})
@@ -145,7 +148,7 @@
add_dependencies(${target} ${RTCSKEL_PROJECT_NAME})
-install(FILES ${ALL_IDL_FILES} ${ALL_IDL_HEADERS} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/idl)
+install(FILES ${ALL_IDL_FILES} ${ALL_IDL_HEADERS} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/ext)
foreach(idl ${idls})
if(CORBA STREQUAL "ORBexpress")
@@ -160,6 +163,6 @@
endif()
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/ext)
Modified: trunk/OpenRTM-aist/src/lib/rtm/ext/rtmManipulator/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ext/rtmManipulator/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/rtmManipulator/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -1,8 +1,14 @@
cmake_minimum_required (VERSION 2.6)
-set(target rtmManipulator${RTM_SHORT_VERSION}_${RTM_VC_VER})
+
+if(WIN32)
+ set(target rtmManipulator${RTM_SHORT_VERSION}_${RTM_VC_VER})
+else(WIN32)
+ set(target rtmManipulator)
+endif(WIN32)
+
project (${target})
@@ -154,7 +160,7 @@
-install(FILES ${ALL_IDL_FILES} ${ALL_IDL_HEADERS} DESTINATION ${OPENRTM_VERSION}/rtm/idl)
+install(FILES ${ALL_IDL_FILES} ${ALL_IDL_HEADERS} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/ext)
@@ -171,4 +177,4 @@
endif()
endforeach(idl)
-install(FILES ${SKEL_STUB_HEADER_FILES} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/idl)
\ No newline at end of file
+install(FILES ${SKEL_STUB_HEADER_FILES} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/ext)
Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -132,4 +132,7 @@
set(SKEL_IDL_SRCS ${SKEL_STUB_SOURCE_FILES} PARENT_SCOPE)
#set(SKEL_IDL_DIR ${PROJECT_BINARY_DIR} PARENT_SCOPE)
else(WIN32)
-endif(WIN32)
\ No newline at end of file
+endif(WIN32)
+
+
+add_subdirectory(device_interfaces)
Added: trunk/OpenRTM-aist/src/lib/rtm/idl/device_interfaces/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/device_interfaces/CMakeLists.txt (rev 0)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/device_interfaces/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -0,0 +1,8 @@
+cmake_minimum_required (VERSION 2.6)
+
+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)
+endforeach()
+
+
Modified: trunk/OpenRTM-aist/utils/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/utils/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -5,9 +5,9 @@
add_subdirectory(rtcprof)
add_subdirectory(cmake)
add_subdirectory(rtm-skelwrapper)
+add_subdirectory(rtc-template)
-
if(VXWORKS)
else(VXWORKS)
if(Boost_FOUND)
@@ -17,6 +17,7 @@
if(UNIX)
add_subdirectory(rtm-naming)
+ add_subdirectory(rtm-config)
endif(UNIX)
if(CORBA MATCHES "ORBexpress")
Modified: trunk/OpenRTM-aist/utils/cmake/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/cmake/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/utils/cmake/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -12,13 +12,29 @@
elseif(CORBA STREQUAL "TAO")
endif()
-set(OPENRTM_LIBRARIES "optimized;${RTM_PROJECT_NAME};debug;${RTM_PROJECT_NAME}d;optimized;${COIL_PROJECT_NAME};debug;${COIL_PROJECT_NAME}d;${RTM_LINKER_OPTION}")
+if(WIN32)
+ set(rtmCamera rtmCamera${RTM_SHORT_VERSION}_${RTM_VC_VER})
+ set(rtmManipulator rtmManipulator${RTM_SHORT_VERSION}_${RTM_VC_VER})
+ set(OPENRTM_LIBRARIES "optimized;${RTM_PROJECT_NAME};debug;${RTM_PROJECT_NAME}d;optimized;${COIL_PROJECT_NAME};debug;${COIL_PROJECT_NAME}d;${RTM_LINKER_OPTION};optimized;${rtmCamera};debug;${rtmCamera}d;optimized;${rtmManipulator};debug;${rtmManipulator}d")
+else(WIN32)
+ set(OPENRTM_LIBRARIES "${RTM_PROJECT_NAME};${COIL_PROJECT_NAME};${ORB_LIBRARIES};rtmCamera;rtmManipulator")
+endif(WIN32)
+
+
+
if(VXWORKS)
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})
+ elseif(CORBA STREQUAL "TAO")
+ 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})
@@ -25,10 +41,12 @@
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})
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})
endif()
- install(FILES ${PROJECT_BINARY_DIR}/cmake/OpenRTMConfig.cmake DESTINATION ${INSTALL_RTM_BIN_DIR})
+
# configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OpenRTMFind_win.cmake.in ${PROJECT_BINARY_DIR}/OpenRTMFind.cmake @ONLY)
endif()
Added: trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig_Linux.cmake.in
===================================================================
--- trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig_Linux.cmake.in (rev 0)
+++ trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig_Linux.cmake.in 2018-11-07 08:10:49 UTC (rev 3437)
@@ -0,0 +1,84 @@
+# -*- cmake -*-
+#
+# @file OpenRTMConfig.cmake
+# @brief cmake-config file for OpenRTM-aist
+# @author Noriaki Ando
+#
+# This file is used for cmake config-mode.
+# The following variables are defined.
+#
+# Basic compiler/linker options
+# - OPENRTM_CFLAGS: cflags
+# - OPENRTM_INCLUDE_DIRS: include directories
+# - OPENRTM_LDFLAGS: linker options
+# - OPENRTM_LIBRARY_DIRS: library directories
+# - OPENRTM_LIBRARIES: libraries
+# - OPENRTM_LIB_DIR: OpenRTM's lib directory
+#
+# OpenRTM-aist specific directory
+# - COIL_INCLUDE_DIR: coil include dir
+# - OPENRTM_INCLUDE_DIR: OpenRTM's include directory
+# - OPENRTM_LIB_DIR: OpenRTM's lib directory
+# - OPENRTM_DATA_DIR: OpenRTM's shared directory
+#
+# OpenRTM-aist version
+# - OPENRTM_VERSION: x.y.z version
+# - OPENRTM_VERSION_MAJOR: major version number
+# - OPENRTM_VERSION_MINOR: minor version number
+# - OPENRTM_VERSION_PATCH: revision number
+# - OPENRTM_SHORT_VERSION: short version number 1.1.0->110
+#
+# OpenRTM-aist's CORBA related settings
+# - OPENRTM_ORB: CORBA implementation
+# - OPENRTM_IDL_WRAPPER: rtm-skelwrapper command
+# - OPENRTM_IDL_WRAPPER_FLAGS: rtm-skelwrapper flag
+# - OPENRTM_IDLC: IDL command
+# - OPENRTM_IDLFLAGS: IDL optins
+
+message(STATUS "OpenRTMConfig.cmake found.")
+message(STATUS "Configrued by configuration mode.")
+
+
+# Basic compiler/linker options
+set(OPENRTM_CFLAGS -Wall -fPIC -O2)
+set(OPENRTM_INCLUDE_DIRS @CMAKE_INSTALL_PREFIX@/include @CMAKE_INSTALL_PREFIX@/@INSTALL_COIL_INCLUDE_DIR@ @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_INCLUDE_DIR@ @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_INCLUDE_DIR@/rtm/idl @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_INCLUDE_DIR@/rtm/ext)
+set(OPENRTM_LDFLAGS -luuid -lrt -ldl -export-dynamic)
+set(OPENRTM_LIBRARY_DIRS @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_LIB_DIR@)
+set(OPENRTM_LIBRARIES pthread;@OPENRTM_LIBRARIES@)
+set(OPENRTM_LIB_DIR @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_LIB_DIR@)
+set(OPENRTM_DIR @CMAKE_INSTALL_PREFIX@)
+
+# OpenRTM-aist specific directory
+set(COIL_INCLUDE_DIR @CMAKE_INSTALL_PREFIX@/@INSTALL_COIL_INCLUDE_DIR@)
+set(OPENRTM_INCLUDE_DIR @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_INCLUDE_DIR@)
+set(OPENRTM_LIB_DIR @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_LIB_DIR@)
+set(OPENRTM_DATA_DIR @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_SHARE_DIR@)
+
+# OpenRTM-aist version
+set(OPENRTM_VERSION @RTM_VERSION@)
+set(OPENRTM_VERSION_MAJOR @RTM_MAJOR_VERSION@)
+set(OPENRTM_VERSION_MINOR @RTM_MINOR_VERSION@)
+set(OPENRTM_VERSION_PATCH @RTM_REVISION_NUM@)
+set(OPENRTM_SHORT_VERSION @RTM_SHORT_VERSION@)
+
+# OpenRTM-aist's CORBA related settings
+set(OPENRTM_ORB omniORB)
+set(OPENRTM_IDL_WRAPPER rtm-skelwrapper)
+set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir= --skel-suffix=Skel --stub-suffix=Stub)
+set(OPENRTM_IDLC @IDL_COMPILE_COMMAND@)
+set(OPENRTM_IDLFLAGS -bcxx -Wba -nf -Wbuse_quotes -Wbshortcut)
+
+include(FindPkgConfig)
+#
+# Getting omniORB settings
+#
+pkg_check_modules(OMNIORB REQUIRED omniORB4)
+if(NOT OMNIORB_DIR)
+ if(OMNIORB_FOUND)
+ set(OMNIORB_DIR )
+ endif()
+ set(OMNIORB_DIR CACHE PATH omniORB root directory)
+endif()
+
+message(STATUS "OpenRTM-aist configuration done")
+# end of OpenRTMConfig.cmake
Added: trunk/OpenRTM-aist/utils/rtc-template/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtc-template/CMakeLists.txt (rev 0)
+++ trunk/OpenRTM-aist/utils/rtc-template/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -0,0 +1,5 @@
+cmake_minimum_required (VERSION 2.6)
+
+
+
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/rtc-template DESTINATION ${INSTALL_RTM_BIN_DIR})
Added: trunk/OpenRTM-aist/utils/rtm-config/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtm-config/CMakeLists.txt (rev 0)
+++ trunk/OpenRTM-aist/utils/rtm-config/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -0,0 +1,30 @@
+cmake_minimum_required (VERSION 2.6)
+
+
+
+set(INSTALL_INCLUDE_DIR include)
+set(INSTALL_RTM_IDL_DIR ${INSTALL_RTM_INCLUDE_DIR}/rtm/idl)
+set(INSTALL_DATA_DIR openrtm-${RTM_MAJOR_VERSION}.${RTM_MINOR_VERSION})
+set(INSTALL_RTM_IDL_DIR ${INSTALL_RTM_INCLUDE_DIR}/rtm/idl)
+set(INSTALL_RTC_DIR ${INSTALL_RTM_EXT_DIR}/rtc)
+set(INSTALL_EC_DIR ${INSTALL_RTM_EXT_DIR}/ec)
+set(INSTALL_RTM_DIR ${INSTALL_RTM_EXT_DIR}/rtm)
+set(INSTALL_SVC_DIR ${INSTALL_RTM_EXT_DIR}/rtm)
+set(PACKAGE OpenRTM-aist)
+set(RTM_DESCRIPTION An OMG RTC compliant middleware for robots.)
+set(RTM_LIBS ${RTM_PROJECT_NAME} ${COIL_PROJECT_NAME})
+
+set(LIBS -lpthread ${RTM_LINKER_OPTION})
+foreach(library ${ORB_LIBRARIES})
+ set(LIBS ${LIBS} -l${library})
+endforeach()
+set(LIBS ${LIBS} -l${RTM_PROJECT_NAME} -l${COIL_PROJECT_NAME} -lrtmCamera -lrtmManipulator)
+
+
+
+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})
+
+
+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)
Added: trunk/OpenRTM-aist/utils/rtm-config/openrtm-aist_cmake.pc.in
===================================================================
--- trunk/OpenRTM-aist/utils/rtm-config/openrtm-aist_cmake.pc.in (rev 0)
+++ trunk/OpenRTM-aist/utils/rtm-config/openrtm-aist_cmake.pc.in 2018-11-07 08:10:49 UTC (rev 3437)
@@ -0,0 +1,37 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}/@CMAKE_INSTALL_PREFIX@
+datarootdir=${prefix}/@INSTALL_RTM_SHARE_DIR@
+data_prefix=${prefix}/@INSTALL_RTM_SHARE_DIR@
+rtm_prefix=@CMAKE_INSTALL_PREFIX@
+rtm_exec_prefix=${prefix}
+rtm_data_prefix=${prefix}/@INSTALL_INCLUDE_DIR@
+
+libdir=${exec_prefix}/@INSTALL_RTM_LIB_DIR@
+includedir=${prefix}/include
+
+rtm_cxx=@CMAKE_CXX_COMPILER@
+rtm_cflags=-I at CMAKE_INSTALL_PREFIX@/include -I${prefix}/@INSTALL_COIL_INCLUDE_DIR@ -I${prefix}/@INSTALL_COIL_INCLUDE_DIR@ -I${prefix}/@INSTALL_RTM_IDL_DIR@
+rtm_libs=@RTM_LINKER_OPTION@ -L${exec_prefix}/@INSTALL_RTM_LIB_DIR@ @LIBS@
+rtm_version=@RTM_VERSION@
+rtm_orb=@CORBA@
+rtm_idlc=@IDL_COMPILE_COMMAND@
+rtm_idlflags=@IDLCOMMAND_FLAGS@ -I${prefix}/@INSTALL_RTM_IDL_DIR@
+# other variables
+rtm_includedir=${prefix}/@INSTALL_RTM_INCLUDE_DIR@
+rtm_idldir=${prefix}/@INSTALL_RTM_IDL_DIR@
+rtm_libdir=${exec_prefix}/@INSTALL_RTM_LIB_DIR@
+rtm_datadir=${datarootdir}/@INSTALL_DATA_DIR@
+rtm_rtcdir=${prefix}/@INSTALL_RTC_DIR@
+rtm_ecdir=${prefix}/@INSTALL_EC_DIR@
+rtm_rtmdir=${prefix}/@INSTALL_RTM_DIR@
+rtm_svcdir=${prefix}/@INSTALL_SVC_DIR@
+rtm_docdir=${prefix}/@INSTALL_RTM_DOC_DIR@
+rtm_exampledir=${prefix}/@INSTALL_RTM_EXAMPLE_DIR@
+coil_includedir=${prefix}/@INSTALL_COIL_INCLUDE_DIR@
+
+Name: @PACKAGE@
+Description: @RTM_DESCRIPTION@
+Version: @RTM_VERSION@
+Requires:
+Libs: @RTM_LIBS@
+Cflags: @RTM_CFLAGS@
Added: trunk/OpenRTM-aist/utils/rtm-config/rtm-config_cmake.in
===================================================================
--- trunk/OpenRTM-aist/utils/rtm-config/rtm-config_cmake.in (rev 0)
+++ trunk/OpenRTM-aist/utils/rtm-config/rtm-config_cmake.in 2018-11-07 08:10:49 UTC (rev 3437)
@@ -0,0 +1,274 @@
+#!/bin/sh
+# -*- shell-script -*-
+#
+# @file rtm-config
+# @brief OpenRTM-aist configuration access utility
+# @date $Date: 2005-05-12 09:06:18 $
+# @author Noriaki Ando <n-ando at aist.go.jp>
+#
+# Copyright (C) 2003-2005, 2012
+# Intelligent Systems Research Institute,
+# National Institute of
+# Advanced Industrial Science and Technology (AIST), Japan
+# All rights reserved.
+#
+# $Id: rtm-config.in 2330 2012-02-21 15:51:53Z n-ando $
+#
+
+rtm_prefix="@CMAKE_INSTALL_PREFIX@"
+rtm_exec_prefix="${prefix}"
+rtm_data_prefix="${prefix}/@INSTALL_RTM_SHARE_DIR@"
+prefix="@CMAKE_INSTALL_PREFIX@"
+exec_prefix="${prefix}"
+datarootdir="${prefix}/@INSTALL_INCLUDE_DIR@"
+
+init_variables()
+{
+# basic options
+rtm_cxx="@CMAKE_CXX_COMPILER@"
+rtm_cflags=`echo @CXXFLAGS@ -I at prefix@/include -I at coil_includedir@ -I at rtm_includedir@ -I at rtm_idldir@ | sed -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_cflags_I=`echo $rtm_cflags | sed -e 's/-[^I][^ ]*//g' -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_cflags_o=`echo $rtm_cflags | sed -e 's/-I[^ ]*//g' -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_libs=`echo @LDFLAGS@ -L at libdir@ @LIBS@ -lRTC -lcoil | sed -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_libs_l=`echo $rtm_libs | sed -e 's/-[^l][^ ]*//g' -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_libs_L=`echo $rtm_libs | sed -e 's/-[^L][^ ]*//g' -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_libs_o=`echo $rtm_libs | sed -e 's/-[lL][^ ]*//g' -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_version="@RTM_VERSION@"
+rtm_orb="@CORBA@"
+rtm_idlc="@IDL_COMPILE_COMMAND@"
+rtm_idlflags=` echo @IDL_FLAGS@ -I at rtm_idldir@ | sed -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_idlflags_I=` echo $rtm_idlflags | sed -e 's/-[^I][^ ]*//g' -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_idlflags_o=` echo $rtm_idlflags | sed -e 's/-I[^ ]*//g' -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+# other variables
+rtm_includedir="${prefix}/@INSTALL_RTM_INCLUDE_DIR@"
+rtm_idldir="${prefix}/@INSTALL_RTM_IDL_DIR@"
+rtm_libdir="${exec_prefix}/@INSTALL_RTM_LIB_DIR@"
+rtm_datadir="${datarootdir}/@INSTALL_DATA_DIR@"
+rtm_rtcdir="${prefix}/@INSTALL_RTC_DIR@"
+rtm_ecdir="${prefix}/@INSTALL_EC_DIR@"
+rtm_rtmdir="${prefix}/@INSTALL_RTM_DIR@"
+rtm_svcdir="${prefix}/@INSTALL_SVC_DIR@"
+rtm_docdir="${prefix}/@INSTALL_RTM_DOC_DIR@"
+rtm_exampledir="${prefix}/@INSTALL_RTM_EXAMPLE_DIR@"
+coil_includedir="${prefix}/@INSTALL_COIL_INCLUDE_DIR@"
+}
+
+usage()
+{
+ cat <<EOF
+Usage: rtm-config [OPTIONS]
+Options:
+ [--prefix[=DIR]] ${prefix}
+ [--exec-prefix[=DIR]] ${exec_prefix}
+ [--data-prefix[=DIR]] ${datarootdir}
+ [--version] ${rtm_version}
+ [--cxx] ${rtm_cxx}
+ [--cflags] ${rtm_cflags}
+ [--cflags-only-I] ${rtm_cflags_I}
+ [--cflags-only-other] ${rtm_cflags_o}
+ [--libs] ${rtm_libs}
+ [--libs-only-l] ${rtm_libs_l}
+ [--libs-only-L] ${rtm_libs_L}
+ [--libs-only-other] ${rtm_libs_o}
+ [--libdir] ${rtm_libdir}
+ [--orb] ${rtm_orb}
+ [--idlc] ${rtm_idlc}
+ [--idlflags] ${rtm_idlflags}
+ [--idlflags-only-I] ${rtm_idlflags_I}
+ [--idlflags-only-other] ${rtm_idlflags_o}
+Advanced Options:
+ [--rtm-includedir] ${rtm_includedir}
+ [--rtm-idldir] ${rtm_idldir}
+ [--rtm-libdir] ${rtm_libdir}
+ [--rtm-datadir] ${rtm_datadir}
+ [--rtm-rtcdir] ${rtm_rtcdir}
+ [--rtm-ecdir] ${rtm_ecdir}
+ [--rtm-rtmdir] ${rtm_rtmdir}
+ [--rtm-svcdir] ${rtm_svcdir}
+ [--rtm-docdir] ${rtm_docdir}
+ [--rtm-exampledir] ${rtm_exampledir}
+ [--coil-includedir] ${coil_includedir}
+EOF
+ exit $1
+}
+
+if test $# -eq 0; then
+ usage 1 1>&2
+fi
+
+
+while test $# -gt 0; do
+ case "$1" in
+ --*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+ case $1 in
+ --help|-h)
+ init_variables
+ usage 1 1>&2
+ ;;
+ --prefix=*)
+ prefix=$optarg
+ if test "x$exec_prefix_set" = "x" ; then
+ exec_prefix=$optarg
+ fi
+ if test "x$data_prefix_set" = "x" ; then
+ data_prefix=$optarg
+ fi
+ ;;
+ --prefix)
+ echo_prefix=yes
+ ;;
+ --exec-prefix=*)
+ exec_prefix=$optarg
+ exec_prefix_set=yes
+ ;;
+ --exec-prefix)
+ echo_exec_prefix=yes
+ ;;
+ --data-prefix=*)
+ datarootdir=$optarg
+ data_prefix_set=yes
+ ;;
+ --data-prefix)
+ echo_data_prefix=yes
+ ;;
+ --version)
+ echo_rtm_version=yes
+ ;;
+ --cxx)
+ echo_cxx=yes
+ ;;
+ --cflags)
+ echo_cflags=yes
+ ;;
+ --cflags-only-I)
+ echo_cflags_I=yes
+ ;;
+ --cflags-only-other)
+ echo_cflags_o=yes
+ ;;
+ --libs)
+ echo_libs=yes
+ ;;
+ --libs-only-l)
+ echo_libs_l=yes
+ ;;
+ --libs-only-L)
+ echo_libs_L=yes
+ ;;
+ --libs-only-other)
+ echo_libs_o=yes
+ ;;
+ --libdir)
+ echo_libdir=yes
+ ;;
+ --orb)
+ echo_orb=yes
+ ;;
+ --idlc)
+ echo_idlc=yes
+ ;;
+ --idlflags)
+ echo_idlflags=yes
+ ;;
+ --idlflags-only-I)
+ echo_idlflags_I=yes
+ ;;
+ --idlflags-only-other)
+ echo_idlflags_o=yes
+ ;;
+ *)
+ init_variables
+ optstr0=`echo $1 | sed -e 's/^\-\-//'`
+ optstr=`echo $optstr0 | sed -e 's/-/_/g'`
+ variable=`eval echo \$"$optstr"`
+ if test "x$variable" = "x"; then
+ echo "Unknown option: " $1
+ usage 1 1>&2
+ else
+ variable_exists=yes
+ variables="$variables \$$optstr"
+ fi
+ ;;
+ esac
+ shift
+done
+
+init_variables
+
+if test "$echo_prefix" = "yes"; then
+ echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+ echo $exec_prefix
+fi
+
+if test "$echo_data_prefix" = "yes"; then
+ echo $datarootdir
+fi
+
+if test "$echo_rtm_version" = "yes"; then
+ echo $rtm_version
+fi
+
+if test "$echo_cxx" = "yes"; then
+ echo $rtm_cxx
+fi
+
+if test "$echo_cflags" = "yes"; then
+ echo $rtm_cflags
+fi
+
+if test "$echo_cflags_I" = "yes"; then
+ echo $rtm_cflags_I
+fi
+
+if test "$echo_cflags_o" = "yes"; then
+ echo $rtm_cflags_o
+fi
+
+if test "$echo_libs" = "yes"; then
+ echo $rtm_libs
+fi
+
+if test "$echo_libs_l" = "yes"; then
+ echo $rtm_libs_l
+fi
+
+if test "$echo_libs_L" = "yes"; then
+ echo $rtm_libs_L
+fi
+
+if test "$echo_libs_o" = "yes"; then
+ echo $rtm_libs_o
+fi
+
+if test "$echo_libdir" = "yes"; then
+ echo $rtm_libdir
+fi
+
+if test "$echo_orb" = "yes"; then
+ echo $rtm_orb
+fi
+
+if test "$echo_idlc" = "yes"; then
+ echo $rtm_idlc
+fi
+
+if test "$echo_idlflags" = "yes"; then
+ echo $rtm_idlflags
+fi
+
+if test "$echo_idlflags_I" = "yes"; then
+ echo $rtm_idlflags_I
+fi
+
+if test "$echo_idlflags_o" = "yes"; then
+ echo $rtm_idlflags_o
+fi
+
+if test "$variable_exists" = "yes"; then
+ eval echo $variables
+fi
Modified: trunk/OpenRTM-aist/utils/rtm-naming/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtm-naming/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/utils/rtm-naming/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -1,4 +1,6 @@
cmake_minimum_required (VERSION 2.6)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rtm-naming.in ${PROJECT_BINARY_DIR}/rtm-naming)
+
+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})
Modified: trunk/OpenRTM-aist/utils/rtm-skelwrapper/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtm-skelwrapper/CMakeLists.txt 2018-11-07 06:24:23 UTC (rev 3436)
+++ trunk/OpenRTM-aist/utils/rtm-skelwrapper/CMakeLists.txt 2018-11-07 08:10:49 UTC (rev 3437)
@@ -3,9 +3,10 @@
if(UNIX)
install(FILES rtm-skelwrapper DESTINATION ${INSTALL_RTM_BIN_DIR})
+ install(FILES skel_wrapper.py DESTINATION ${INSTALL_RTM_SCRIPT_DIR})
elseif(MSVC)
configure_file(rtm-skelwrapper ${PROJECT_BINARY_DIR}/rtm-skelwrapper.py COPYONLY)
install(FILES ${PROJECT_BINARY_DIR}/rtm-skelwrapper.py DESTINATION ${INSTALL_RTM_BIN_DIR})
endif(UNIX)
-install(FILES skel_wrapper.py DESTINATION ${INSTALL_RTM_BIN_DIR})
\ No newline at end of file
+
openrtm-commit メーリングリストの案内