[openrtm-commit:03358] r3431 - in trunk/OpenRTM-aist: . docs examples/Analyzer examples/AutoTest examples/Composite examples/ConfigSample examples/ExtTrigger examples/HelloWorld examples/SeqIO examples/SimpleIO examples/SimpleService examples/StaticFsm examples/StringIO examples/Throughput src/ext/ec/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/rtm src/lib/rtm/ext/rtmCamera src/lib/rtm/ext/rtmManipulator src/lib/rtm/idl utils/cmake utils/rtcd utils/rtcprof utils/rtcsh utils/rtm-skelwrapper
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 11月 6日 (火) 14:23:34 JST
Author: miyamoto
Date: 2018-11-06 14:23:34 +0900 (Tue, 06 Nov 2018)
New Revision: 3431
Added:
trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig.cmake.in
trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig_TAO.cmake.in
trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig_omniORB.cmake.in
Modified:
trunk/OpenRTM-aist/CMakeLists.txt
trunk/OpenRTM-aist/docs/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/StaticFsm/Microwave.cpp
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/CMakeLists.txt
trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
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/cmake/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-skelwrapper/CMakeLists.txt
Log:
[compat, cmake]
Modified: trunk/OpenRTM-aist/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -19,28 +19,125 @@
if(NOT ORB_ROOT)
-
- if(CORBA MATCHES "omniORB")
+ if(CORBA STREQUAL "omniORB")
if(UNIX)
- set(ORB_ROOT "/usr")
+ set(ORB_ROOT "/usr" CACHE PATH "set ORB_ROOT")
else(UNIX)
message(FATAL_ERROR "Please set ORB_ROOT.")
endif(UNIX)
+
+
+
else()
message(FATAL_ERROR "Please set ORB_ROOT.")
endif()
endif()
+
+
+
+if(MSVC)
+ if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008")
+ set(RTM_VC_VER "vc9")
+ endif()
+ if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 10 2010")
+ set(RTM_VC_VER "vc10")
+ endif()
+ if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 10 2010 Win64")
+ set(RTM_VC_VER "vc10")
+ endif()
+ if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 11 2012")
+ set(RTM_VC_VER "vc11")
+ endif()
+ if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 11 2012 Win64")
+ set(RTM_VC_VER "vc11")
+ endif()
+ if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 2013")
+ set(RTM_VC_VER "vc12")
+ endif()
+ if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 2013 Win64")
+ set(RTM_VC_VER "vc12")
+ endif()
+ if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015")
+ set(RTM_VC_VER "vc14")
+ endif()
+ if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015 Win64")
+ set(RTM_VC_VER "vc14")
+ endif()
+ if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 15 2017")
+ set(RTM_VC_VER "vc141")
+ endif()
+ if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 15 2017 Win64")
+ set(RTM_VC_VER "vc141")
+ endif()
+ if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 11 2012 ARM")
+ set(RTM_VC_VER "vc11")
+ endif()
+ if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 2013 ARM")
+ set(RTM_VC_VER "vc12")
+ endif()
+ if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015 ARM")
+ set(RTM_VC_VER "vc14")
+ endif()
+ if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 15 2017 ARM")
+ set(RTM_VC_VER "vc141")
+ endif()
+endif(MSVC)
+
+
+
+set(RTM_MAJOR_VERSION 2 CACHE STRING "RTM major version")
+set(RTM_MINOR_VERSION 0 CACHE STRING "RTM minor version")
+set(RTM_REVISION_NUM 0 CACHE STRING "RTM revision numver")
+set(RTM_SHORT_VERSION 200 CACHE STRING "RTM short version")
+set(RTM_VERSION 2.0.0 CACHE STRING "RTM version")
+set(OPENRTM_VERSION ${RTM_MAJOR_VERSION}.${RTM_MINOR_VERSION}.${RTM_REVISION_NUM} CACHE STRING "RTM version.")
+set(OPENRTM_NAME OpenRTM-aist-${OPENRTM_VERSION} CACHE STRING "RTM name.")
+
+
+set(COIL_PROJECT_NAME coil${RTM_MAJOR_VERSION}${RTM_MINOR_VERSION}${RTM_REVISION_NUM})
+set(RTM_PROJECT_NAME RTC${RTM_MAJOR_VERSION}${RTM_MINOR_VERSION}${RTM_REVISION_NUM})
+set(RTCSKEL_PROJECT_NAME RTCSkel)
+
+if(MSVC)
+ set(COIL_PROJECT_NAME ${COIL_PROJECT_NAME}_${RTM_VC_VER})
+ set(RTM_PROJECT_NAME ${RTM_PROJECT_NAME}_${RTM_VC_VER})
+endif(MSVC)
+
+if(MSVC)
+ set(INSTALL_RTM_SCRIPT_DIR ${OPENRTM_VERSION}/bin/)
+
+ set(INSTALL_RTM_BIN_DIR ${OPENRTM_VERSION}/bin/${RTM_VC_VER}/)
+ set(INSTALL_RTM_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_DOC_DIR ${OPENRTM_VERSION}/docs/)
+ set(INSTALL_RTM_EXT_DIR ${OPENRTM_VERSION}/ext/)
+ set(INSTALL_RTM_CMAKE_DIR ${OPENRTM_VERSION}/cmake/)
+else(MSVC)
+ set(INSTALL_RTM_SCRIPT_DIR bin)
+ set(INSTALL_RTM_BIN_DIR bin)
+ set(INSTALL_RTM_INCLUDE_DIR include)
+ 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)
+endif(MSVC)
+
+
+
+
set(SSL_ENABLE ${SSL_ENABLE} CACHE BOOL "set SSL_ENABLE")
set(OBSERVER_ENABLE ${OBSERVER_ENABLE} CACHE BOOL "set OBSERVER_ENABLE")
-if(CORBA MATCHES "ORBexpress")
+if(CORBA STREQUAL "ORBexpress")
if(NOT IDL_COMPILE_COMMAND)
set(IDL_COMPILE_COMMAND ${ORB_ROOT}/host/x86_linux_2.6/bin/idl2cpp)
endif()
SET(IDLCOMMAND_FLAGS -m -a -ex -fhh -fxcc -fc_c -fs -q -dOE_IDL -I${ORB_ROOT}/idl )
-elseif(CORBA MATCHES "omniORB")
+elseif(CORBA STREQUAL "omniORB")
if(NOT IDL_COMPILE_COMMAND)
if(VXWORKS)
set(IDL_COMPILE_COMMAND ${ORB_ROOT}/build/bin/omniidl)
@@ -52,7 +149,13 @@
endif()
SET(IDLCOMMAND_FLAGS -bcxx -Wba -nf -Wbshortcut)
#SET(IDLCOMMAND_FLAGS -bcxx -Wba -nf)
-elseif(CORBA MATCHES "TAO")
+
+ set(OMNI_VERSION ${OMNI_VERSION} CACHE STRING "set OMNI_VERSION ")
+ set(OMNI_MINOR ${OMNI_MINOR} CACHE STRING "set OMNI_MINOR ")
+ set(OMNITHREAD_VERSION ${OMNI_MINOR} CACHE STRING "set OMNITHREAD_VERSION ")
+ string(REGEX REPLACE "([0-9])([0-9])$" "\\1" OMNI_VERSION1 ${OMNI_VERSION})
+ string(REGEX REPLACE "([0-9])([0-9])$" "\\2" OMNI_VERSION2 ${OMNI_VERSION})
+elseif(CORBA STREQUAL "TAO")
if(NOT IDL_COMPILE_COMMAND)
if(VXWORKS)
message(FATAL_ERROR "Please set IDL_COMPILE_COMMAND.")
@@ -98,7 +201,7 @@
-if(CORBA MATCHES "ORBexpress")
+if(CORBA STREQUAL "ORBexpress")
set(CORBA_NAME "ORBexpress" CACHE STRING "CORBA name.")
if(RTP)
set(OE_TARGET gcc_4.1.2_Rp)
@@ -137,7 +240,7 @@
set(ORB_C_FLAGS_LIST ${ORB_C_FLAGS_LIST} -D__x86__)
endif()
ADD_DEFINITIONS(${ORB_C_FLAGS_LIST})
-elseif(CORBA MATCHES "omniORB")
+elseif(CORBA STREQUAL "omniORB")
set(CORBA_NAME "omniORB" CACHE STRING "CORBA name.")
if(VXWORKS)
if("${VX_CPU_FAMILY}" STREQUAL "ppc")
@@ -174,22 +277,86 @@
endif(SSL_ENABLE)
elseif(MSVC)
if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "ARM")
+ SET(ARCH_NAME ARM_win32)
SET (ORB_C_FLAGS_LIST
-D__WIN32__
-D__arm__
)
- set(ORB_LINK_DIR ${ORB_ROOT}/lib/ARM_win32)
+ set(ORB_LINK_DIR ${ORB_ROOT}/lib/${ARCH_NAME})
+ set(OMNIORB_BINARY_DIR ${ORB_ROOT}/bin/${ARCH_NAME})
else()
+ SET(ARCH_NAME x86_win32)
SET (ORB_C_FLAGS_LIST
-D__WIN32__
-D__x86__
)
- set(ORB_LINK_DIR ${ORB_ROOT}/lib/x86_win32)
+ set(ORB_LINK_DIR ${ORB_ROOT}/lib/${ARCH_NAME})
+ set(OMNIORB_BINARY_DIR ${ORB_ROOT}/bin/${ARCH_NAME})
endif()
set(ORB_LIBRARIES optimized;omniDynamic${OMNI_VERSION}${OMNI_MINOR}_rt;optimized;omniORB${OMNI_VERSION}${OMNI_MINOR}_rt;optimized;omnithread${OMNITHREAD_VERSION}_rt;debug;omniDynamic${OMNI_VERSION}${OMNI_MINOR}_rtd;debug;omniORB${OMNI_VERSION}${OMNI_MINOR}_rtd;debug;omnithread${OMNITHREAD_VERSION}_rtd)
if(SSL_ENABLE)
set(ORBSSL_LIBRARIES optimized;omnisslTP${OMNI_VERSION}${OMNI_MINOR}_rt;debug;omnisslTP${OMNI_VERSION}${OMNI_MINOR}_rtd)
endif(SSL_ENABLE)
+
+
+
+ #message(STATUS ${OMNI_VERSION1})
+ #message(STATUS ${OMNI_VERSION2})
+
+ set(ORB_INSTALL_DIR ${OPENRTM_VERSION}/omniORB/${OMNI_VERSION1}.${OMNI_VERSION2}.${OMNI_MINOR}_${RTM_VC_VER}/)
+ 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})
+ endif()
+ endforeach()
+
+ file(GLOB OMNIORB_HEADERFILES1 "${ORB_ROOT}/include/*.h")
+ file(GLOB OMNIORB_HEADERFILES2 "${ORB_ROOT}/include/*/*.h")
+ file(GLOB OMNIORB_HEADERFILES3 "${ORB_ROOT}/include/*/*/*.h")
+ file(GLOB OMNIORB_HEADERFILES4 "${ORB_ROOT}/include/*.hh")
+ file(GLOB OMNIORB_HEADERFILES5 "${ORB_ROOT}/include/*/*.hh")
+ file(GLOB OMNIORB_HEADERFILES6 "${ORB_ROOT}/include/*/*/*.hh")
+ file(GLOB OMNIORB_HEADERFILES7 "${ORB_ROOT}/include/*.hxx")
+ file(GLOB OMNIORB_HEADERFILES8 "${ORB_ROOT}/include/*/*.hxx")
+ file(GLOB OMNIORB_HEADERFILES9 "${ORB_ROOT}/include/*/*/*.hxx")
+
+ set(OMNIORB_HEADERFILES ${OMNIORB_HEADERFILES1} ${OMNIORB_HEADERFILES2} ${OMNIORB_HEADERFILES3}
+ ${OMNIORB_HEADERFILES4} ${OMNIORB_HEADERFILES5} ${OMNIORB_HEADERFILES6}
+ ${OMNIORB_HEADERFILES7} ${OMNIORB_HEADERFILES8} ${OMNIORB_HEADERFILES9})
+
+ foreach(file_path ${OMNIORB_HEADERFILES})
+ 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})
+ endforeach()
+
+
+ file(GLOB OMNIORB_IDLFILES1 "${ORB_ROOT}/idl/*.idl")
+ file(GLOB OMNIORB_IDLFILES2 "${ORB_ROOT}/idl/*/*.idl")
+
+ set(OMNIORB_IDLFILES ${OMNIORB_IDLFILES1} ${OMNIORB_IDLFILES2})
+ 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})
+ 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)
+ 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(FILES ${OMNIORB_HEADERFILES} DESTINATION ${ORB_INSTALL_DIR}/include)
+
+
endif(VXWORKS)
set(ORB_INCLUDE_DIR ${ORB_ROOT}/include)
@@ -197,7 +364,7 @@
ADD_DEFINITIONS(${ORB_C_FLAGS_LIST})
-elseif(CORBA MATCHES "TAO")
+elseif(CORBA STREQUAL "TAO")
set(CORBA_NAME "TAO" CACHE STRING "CORBA name.")
if(VXWORKS)
@@ -217,9 +384,117 @@
set(ORB_INCLUDE_DIR ${ORB_ROOT} ${ORB_ROOT}/TAO ${ORB_ROOT}/TAO/orbsvcs)
elseif(MSVC)
set(ORB_LINK_DIR ${ORB_ROOT}/lib)
- set(ORB_LIBRARIES optimized;ACE;optimized;TAO;optimized;TAO_AnyTypeCode;optimized;TAO_PortableServer;optimized;TAO_Svc_Utils;optimized;TAO_CosNaming;optimized;TAO_IORTable;optimized;TAO_CodecFactory;optimized;TAO_PI;optimized;TAO_Utils;optimized;TAO_Strategies;debug;ACEd;debug;TAOd;debug;TAO_AnyTypeCoded;debug;TAO_PortableServerd;debug;TAO_Svc_Utilsd;debug;TAO_CosNamingd;debug;TAO_IORTabled;debug;TAO_CodecFactoryd;debug;TAO_PId;debug;TAO_Utilsd;debug;TAO_Strategiesd;iphlpapi)
+ set(ORB_LIBRARIES1 optimized;ACE;optimized;TAO;optimized;TAO_AnyTypeCode;optimized;TAO_PortableServer;optimized;TAO_Svc_Utils;optimized;TAO_CosNaming;optimized;TAO_IORTable;optimized;TAO_CodecFactory;optimized;TAO_PI;optimized;TAO_Utils;optimized;TAO_Strategies;debug;ACEd;debug;TAOd;debug;TAO_AnyTypeCoded;debug;TAO_PortableServerd;debug;TAO_Svc_Utilsd;debug;TAO_CosNamingd;debug;TAO_IORTabled;debug;TAO_CodecFactoryd;debug;TAO_PId;debug;TAO_Utilsd;debug;TAO_Strategiesd)
+ set(ORB_LIBRARIES2 iphlpapi)
+ set(ORB_LIBRARIES ${ORB_LIBRARIES1};${ORB_LIBRARIES2})
+
set(ORB_INCLUDE_DIR ${ORB_ROOT} ${ORB_ROOT}/TAO ${ORB_ROOT}/TAO/orbsvcs)
SET(ORB_C_FLAGS_LIST ${ORB_C_FLAGS_LIST} -D_WINSOCKAPI_ -DWITH_ACE)
+
+
+ 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/)
+ endif()
+ endforeach()
+
+
+ file(GLOB ACE_HEADERFILES1 "${ORB_ROOT}/ace/*.h")
+ file(GLOB ACE_HEADERFILES2 "${ORB_ROOT}/ace/*/*.h")
+ file(GLOB ACE_HEADERFILES3 "${ORB_ROOT}/ace/*/*/*.h")
+ file(GLOB ACE_HEADERFILES4 "${ORB_ROOT}/ace/*/*/*/*.h")
+ file(GLOB ACE_HEADERFILES5 "${ORB_ROOT}/ace/*/*/*/*/*.h")
+
+ file(GLOB ACE_HEADERFILES6 "${ORB_ROOT}/ace/*.inl")
+ file(GLOB ACE_HEADERFILES7 "${ORB_ROOT}/ace/*/*.inl")
+ file(GLOB ACE_HEADERFILES8 "${ORB_ROOT}/ace/*/*/*.inl")
+ file(GLOB ACE_HEADERFILES9 "${ORB_ROOT}/ace/*/*/*/*.inl")
+ file(GLOB ACE_HEADERFILES10 "${ORB_ROOT}/ace/*/*/*/*/*.inl")
+
+ file(GLOB ACE_HEADERFILES11 "${ORB_ROOT}/ace/*.cpp")
+ #file(GLOB ACE_HEADERFILES12 "${ORB_ROOT}/ace/*/*.cpp")
+ #file(GLOB ACE_HEADERFILES13 "${ORB_ROOT}/ace/*/*/*.cpp")
+ #file(GLOB ACE_HEADERFILES14 "${ORB_ROOT}/ace/*/*/*/*.cpp")
+ #file(GLOB ACE_HEADERFILES15 "${ORB_ROOT}/ace/*/*/*/*/*.cpp")
+
+
+ file(GLOB ACE_HEADERFILES16 "${ORB_ROOT}/TAO/tao/*.h")
+ file(GLOB ACE_HEADERFILES17 "${ORB_ROOT}/TAO/tao/*/*.h")
+ file(GLOB ACE_HEADERFILES18 "${ORB_ROOT}/TAO/tao/*/*/*.h")
+ file(GLOB ACE_HEADERFILES19 "${ORB_ROOT}/TAO/tao/*/*/*/*.h")
+ file(GLOB ACE_HEADERFILES20 "${ORB_ROOT}/TAO/tao/*/*/*/*/*.h")
+
+ file(GLOB ACE_HEADERFILES21 "${ORB_ROOT}/TAO/tao/*.inl")
+ file(GLOB ACE_HEADERFILES22 "${ORB_ROOT}/TAO/tao/*/*.inl")
+ file(GLOB ACE_HEADERFILES23 "${ORB_ROOT}/TAO/tao/*/*/*.inl")
+ file(GLOB ACE_HEADERFILES24 "${ORB_ROOT}/TAO/tao/*/*/*/*.inl")
+ file(GLOB ACE_HEADERFILES25 "${ORB_ROOT}/TAO/tao/*/*/*/*/*.inl")
+
+ file(GLOB ACE_HEADERFILES26 "${ORB_ROOT}/TAO/tao/*.cpp")
+ file(GLOB ACE_HEADERFILES27 "${ORB_ROOT}/TAO/tao/*/*.cpp")
+ #file(GLOB ACE_HEADERFILES28 "${ORB_ROOT}/TAO/tao/*/*/*.cpp")
+ #file(GLOB ACE_HEADERFILES29 "${ORB_ROOT}/TAO/tao/*/*/*/*.cpp")
+ #file(GLOB ACE_HEADERFILES30 "${ORB_ROOT}/TAO/tao/*/*/*/*/*.cpp")
+
+
+ file(GLOB ACE_HEADERFILES31 "${ORB_ROOT}/TAO/orbsvcs/*.h")
+ file(GLOB ACE_HEADERFILES32 "${ORB_ROOT}/TAO/orbsvcs/*/*.h")
+ file(GLOB ACE_HEADERFILES33 "${ORB_ROOT}/TAO/orbsvcs/*/*/*.h")
+ #file(GLOB ACE_HEADERFILES34 "${ORB_ROOT}/TAO/orbsvcs/*/*/*/*.h")
+ #file(GLOB ACE_HEADERFILES35 "${ORB_ROOT}/TAO/orbsvcs/*/*/*/*/*.h")
+
+ file(GLOB ACE_HEADERFILES36 "${ORB_ROOT}/TAO/orbsvcs/*.inl")
+ file(GLOB ACE_HEADERFILES37 "${ORB_ROOT}/TAO/orbsvcs/*/*.inl")
+ #file(GLOB ACE_HEADERFILES38 "${ORB_ROOT}/TAO/orbsvcs/*/*/*.inl")
+ #file(GLOB ACE_HEADERFILES39 "${ORB_ROOT}/TAO/orbsvcs/*/*/*/*.inl")
+ #file(GLOB ACE_HEADERFILES40 "${ORB_ROOT}/TAO/orbsvcs/*/*/*/*/*.inl")
+
+ #file(GLOB ACE_HEADERFILES41 "${ORB_ROOT}/TAO/orbsvcs/*.cpp")
+ #file(GLOB ACE_HEADERFILES42 "${ORB_ROOT}/TAO/orbsvcs/*/*.cpp")
+ #file(GLOB ACE_HEADERFILES43 "${ORB_ROOT}/TAO/orbsvcs/*/*/*.cpp")
+ #file(GLOB ACE_HEADERFILES44 "${ORB_ROOT}/TAO/orbsvcs/*/*/*/*.cpp")
+ #file(GLOB ACE_HEADERFILES45 "${ORB_ROOT}/TAO/orbsvcs/*/*/*/*/*.cpp")
+
+
+ set(ACE_HEADERFILES ${ACE_HEADERFILES1} ${ACE_HEADERFILES2} ${ACE_HEADERFILES3}
+ ${ACE_HEADERFILES4} ${ACE_HEADERFILES5} ${ACE_HEADERFILES6}
+ ${ACE_HEADERFILES7} ${ACE_HEADERFILES8} ${ACE_HEADERFILES9}
+ ${ACE_HEADERFILES10} ${ACE_HEADERFILES11} ${ACE_HEADERFILES12}
+ ${ACE_HEADERFILES13} ${ACE_HEADERFILES14} ${ACE_HEADERFILES15}
+ ${ACE_HEADERFILES16} ${ACE_HEADERFILES17} ${ACE_HEADERFILES18}
+ ${ACE_HEADERFILES19} ${ACE_HEADERFILES20} ${ACE_HEADERFILES21}
+ ${ACE_HEADERFILES22} ${ACE_HEADERFILES23} ${ACE_HEADERFILES24}
+ ${ACE_HEADERFILES25} ${ACE_HEADERFILES26} ${ACE_HEADERFILES27}
+ ${ACE_HEADERFILES28} ${ACE_HEADERFILES29} ${ACE_HEADERFILES30}
+ ${ACE_HEADERFILES31} ${ACE_HEADERFILES32} ${ACE_HEADERFILES33}
+ ${ACE_HEADERFILES34} ${ACE_HEADERFILES35} ${ACE_HEADERFILES36}
+ ${ACE_HEADERFILES37} ${ACE_HEADERFILES38} ${ACE_HEADERFILES39}
+ ${ACE_HEADERFILES40} ${ACE_HEADERFILES41} ${ACE_HEADERFILES42}
+ ${ACE_HEADERFILES43} ${ACE_HEADERFILES44} ${ACE_HEADERFILES45})
+
+
+ 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})
+ endforeach()
+
+
+
+ file(GLOB TAO_IDLFILES1 "${ORB_ROOT}/TAO/*.idl")
+ file(GLOB TAO_IDLFILES2 "${ORB_ROOT}/TAO/*/*.idl")
+
+ set(TAO_IDLFILES ${TAO_IDLFILES1} ${TAO_IDLFILES2})
+ 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})
+ endforeach()
+
+
endif()
ADD_DEFINITIONS(${ORB_C_FLAGS_LIST})
@@ -262,11 +537,6 @@
-set(RTM_MAJOR_VERSION 2 CACHE STRING "RTM major version")
-set(RTM_MINOR_VERSION 0 CACHE STRING "RTM minor version")
-set(RTM_REVISION_NUM 0 CACHE STRING "RTM revision numver")
-set(RTM_SHORT_VERSION 200 CACHE STRING "RTM short version")
-set(RTM_VERSION 2.0.0 CACHE STRING "RTM version")
@@ -288,64 +558,12 @@
ADD_DEFINITIONS(-DLIBRARY_EXPORTS)
endif()
-set(OPENRTM_NAME OpenRTM-aist-1.2.0 CACHE STRING "RTM name.")
-set(OPENRTM_VERSION 1.2.0 CACHE STRING "RTM version.")
-set(COIL_PROJECT_NAME coil${RTM_MAJOR_VERSION}${RTM_MINOR_VERSION}${RTM_REVISION_NUM})
-set(RTM_PROJECT_NAME RTC${RTM_MAJOR_VERSION}${RTM_MINOR_VERSION}${RTM_REVISION_NUM})
-set(RTCSKEL_PROJECT_NAME RTCSkel)
-if(MSVC)
- if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008")
- set(RTM_VC_VER "vc9")
- endif()
- if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 10 2010")
- set(RTM_VC_VER "vc10")
- endif()
- if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 10 2010 Win64")
- set(RTM_VC_VER "vc10")
- endif()
- if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 11 2012")
- set(RTM_VC_VER "vc11")
- endif()
- if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 11 2012 Win64")
- set(RTM_VC_VER "vc11")
- endif()
- if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 2013")
- set(RTM_VC_VER "vc12")
- endif()
- if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 2013 Win64")
- set(RTM_VC_VER "vc12")
- endif()
- if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015")
- set(RTM_VC_VER "vc14")
- endif()
- if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015 Win64")
- set(RTM_VC_VER "vc14")
- endif()
- if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 15 2017")
- set(RTM_VC_VER "vc141")
- endif()
- if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 15 2017 Win64")
- set(RTM_VC_VER "vc141")
- endif()
- if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 11 2012 ARM")
- set(RTM_VC_VER "vc11")
- endif()
- if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 2013 ARM")
- set(RTM_VC_VER "vc12")
- endif()
- if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015 ARM")
- set(RTM_VC_VER "vc14")
- endif()
- if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 15 2017 ARM")
- set(RTM_VC_VER "vc141")
- endif()
- set(COIL_PROJECT_NAME ${COIL_PROJECT_NAME}_${RTM_VC_VER})
- set(RTM_PROJECT_NAME ${RTM_PROJECT_NAME}_${RTM_VC_VER})
-endif()
+
+
if(WIN32)
set(MAKE_DEF_COMMAND ${CMAKE_SOURCE_DIR}/build/makedeffile.py)
endif(WIN32)
@@ -361,5 +579,5 @@
endif(DOCUMENTS_ENABLE)
if(WIN32)
- install(FILES ${CMAKE_SOURCE_DIR}/win32/OpenRTM-aist/bin/rtm-naming.bat DESTINATION bin)
+ install(FILES ${CMAKE_SOURCE_DIR}/win32/OpenRTM-aist/bin/rtm-naming.bat DESTINATION ${INSTALL_RTM_SCRIPT_DIR})
endif(WIN32)
Modified: trunk/OpenRTM-aist/docs/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/docs/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/docs/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -65,10 +65,10 @@
add_dependencies(${RTM_PROJECT_NAME} ClassReference-en)
-install(DIRECTORY IDLReference DESTINATION docs)
-install(DIRECTORY ClassReference DESTINATION docs)
-install(DIRECTORY IDLReference-en DESTINATION docs)
-install(DIRECTORY ClassReference-en DESTINATION docs)
+install(DIRECTORY IDLReference DESTINATION ${INSTALL_RTM_DOC_DIR})
+install(DIRECTORY ClassReference DESTINATION ${INSTALL_RTM_DOC_DIR})
+install(DIRECTORY IDLReference-en DESTINATION ${INSTALL_RTM_DOC_DIR})
+install(DIRECTORY ClassReference-en DESTINATION ${INSTALL_RTM_DOC_DIR})
Modified: trunk/OpenRTM-aist/examples/Analyzer/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/Analyzer/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/examples/Analyzer/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -27,7 +27,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -35,6 +35,8 @@
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME})
endif(VXWORKS)
+
+
add_executable(${target}Comp ${standalone_srcs})
target_link_libraries(${target}Comp ${libs} ${RTM_LINKER_OPTION})
add_dependencies(${target}Comp ${RTM_PROJECT_NAME})
@@ -44,11 +46,12 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
@@ -77,7 +80,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -94,11 +97,11 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
Modified: trunk/OpenRTM-aist/examples/AutoTest/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/AutoTest/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/examples/AutoTest/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -49,7 +49,7 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
add_dependencies(${target} ${idl_name}_TGT)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -68,11 +68,11 @@
add_dependencies(${target} ${idl_name}_TGT)
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
@@ -104,7 +104,7 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
add_dependencies(${target} ${idl_name}_TGT)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -123,11 +123,11 @@
add_dependencies(${target} ${idl_name}_TGT)
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
Modified: trunk/OpenRTM-aist/examples/Composite/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/Composite/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/examples/Composite/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -24,9 +24,10 @@
target_link_libraries(${target} ${libs} ${RTM_LINKER_OPTION})
add_dependencies(${target} ${RTM_PROJECT_NAME})
-install(TARGETS ${target} RUNTIME DESTINATION examples)
+install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
+
if(VXWORKS)
if(RTP)
set_target_properties(${target} PROPERTIES SUFFIX ".vxe")
@@ -55,7 +56,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -72,11 +73,11 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
@@ -104,7 +105,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -121,11 +122,11 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
@@ -153,7 +154,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -170,11 +171,11 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
Modified: trunk/OpenRTM-aist/examples/ConfigSample/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/ConfigSample/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/examples/ConfigSample/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -25,7 +25,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -44,11 +44,11 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
Modified: trunk/OpenRTM-aist/examples/ExtTrigger/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/ExtTrigger/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/examples/ExtTrigger/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -25,7 +25,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -42,11 +42,11 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
@@ -73,7 +73,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -90,11 +90,11 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
@@ -131,7 +131,7 @@
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif()
Modified: trunk/OpenRTM-aist/examples/HelloWorld/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/HelloWorld/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/examples/HelloWorld/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -25,7 +25,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -42,11 +42,11 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
Modified: trunk/OpenRTM-aist/examples/SeqIO/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/SeqIO/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/examples/SeqIO/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -27,7 +27,7 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
add_dependencies(${target} ${idl_name}_TGT)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -44,11 +44,11 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
@@ -76,7 +76,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -93,11 +93,11 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
Modified: trunk/OpenRTM-aist/examples/SimpleIO/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/SimpleIO/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/examples/SimpleIO/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -25,7 +25,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -42,11 +42,11 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
@@ -75,7 +75,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -92,11 +92,11 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
Modified: trunk/OpenRTM-aist/examples/SimpleService/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/SimpleService/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/examples/SimpleService/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -50,7 +50,7 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
add_dependencies(${target} ${idl_name}_TGT)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -69,11 +69,11 @@
add_dependencies(${target} ${idl_name}_TGT)
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
@@ -110,7 +110,7 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
add_dependencies(${target} ${idl_name}_TGT)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -129,11 +129,11 @@
add_dependencies(${target} ${idl_name}_TGT)
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
Modified: trunk/OpenRTM-aist/examples/StaticFsm/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/StaticFsm/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/examples/StaticFsm/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -25,7 +25,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -42,11 +42,11 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
@@ -75,7 +75,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -92,11 +92,11 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
@@ -126,7 +126,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -143,11 +143,11 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
Modified: trunk/OpenRTM-aist/examples/StaticFsm/Microwave.cpp
===================================================================
--- trunk/OpenRTM-aist/examples/StaticFsm/Microwave.cpp 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/examples/StaticFsm/Microwave.cpp 2018-11-06 05:23:34 UTC (rev 3431)
@@ -71,7 +71,8 @@
RTC::ReturnCode_t Microwave::onExecute(RTC::UniqueId ec_id)
{
- coil::usleep(1000000);
+ //coil::usleep(1000000);
+ m_fsm.run_event();
return RTC::RTC_OK;
}
Modified: trunk/OpenRTM-aist/examples/StringIO/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/StringIO/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/examples/StringIO/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -25,7 +25,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -42,11 +42,11 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
@@ -74,7 +74,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -91,11 +91,11 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
endif()
if(VXWORKS)
Modified: trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -27,7 +27,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -44,14 +44,16 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
set_target_properties(${target} PROPERTIES PREFIX "")
- install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
+
+ install(TARGETS ${target}Comp RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION examples)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
file(GLOB script_files "scripts/*")
- install(FILES ${script_files} DESTINATION examples)
+ install(FILES ${script_files} DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION examples)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXAMPLE_DIR})
endif(WIN32)
+
endif()
Modified: trunk/OpenRTM-aist/src/ext/ec/artlinux/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/artlinux/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/src/ext/ec/artlinux/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -29,7 +29,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ext/ec/artlinux)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec/artlinux)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -45,9 +45,9 @@
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ext/ec/artlinux)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ext/ec/artlinux)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec/artlinux)
endif(WIN32)
endif()
Modified: trunk/OpenRTM-aist/src/ext/ec/logical_time/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/logical_time/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/src/ext/ec/logical_time/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -49,7 +49,7 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
add_dependencies(${target} ${idl_name}_TGT)
- install(TARGETS ${target} RUNTIME DESTINATION ext/ec/logical_time)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec/logical_time)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -66,14 +66,14 @@
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ext/ec/logical_time)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ext/ec/logical_time)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec/logical_time)
endif(WIN32)
endif()
-set_source_files_properties(${${idl_name}_SKEL} PROPERTIES GENERATED 1)
+set_source_files_properties(${${idl_name}_STUB} PROPERTIES GENERATED 1)
Modified: trunk/OpenRTM-aist/src/ext/ec/rtpreempt/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/rtpreempt/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/src/ext/ec/rtpreempt/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -12,10 +12,8 @@
include_directories(
${RTM_INCLUDE_DIR}
${ORB_INCLUDE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}
)
-
ADD_DEFINITIONS(${ORB_C_FLAGS_LIST})
@@ -31,7 +29,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ext/ec/rtpreempt)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/ec/rtpreempt)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -47,9 +45,9 @@
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ext/ec/rtpreempt)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ext/ec/rtpreempt)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/ec/rtpreempt)
endif(WIN32)
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-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/src/ext/local_service/nameservice_file/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -29,7 +29,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ext/local_service/nameservice_file)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/local_service/nameservice_file)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -45,9 +45,9 @@
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ext/local_service/nameservice_file)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ext/local_service/nameservice_file)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/local_service/nameservice_file)
endif(WIN32)
endif()
Modified: trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -29,7 +29,7 @@
target_link_libraries(${target} ${libs})
add_dependencies(${target} ${RTM_PROJECT_NAME})
- install(TARGETS ${target} RUNTIME DESTINATION ext/sdo/extended_fsm)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo/extended_fsm)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -45,9 +45,9 @@
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ext/sdo/extended_fsm)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ext/sdo/extended_fsm)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo/extended_fsm)
endif(WIN32)
endif()
Modified: trunk/OpenRTM-aist/src/ext/sdo/fsm4rtc_observer/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/fsm4rtc_observer/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/src/ext/sdo/fsm4rtc_observer/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -49,7 +49,7 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
add_dependencies(${target} ${idl_name}_RTC_TGT)
- install(TARGETS ${target} RUNTIME DESTINATION ext/sdo/fsm4rtc_observer)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo/fsm4rtc_observer)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -66,9 +66,9 @@
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ext/sdo/fsm4rtc_observer)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ext/sdo/fsm4rtc_observer)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo/fsm4rtc_observer)
endif(WIN32)
endif()
Modified: trunk/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -49,7 +49,7 @@
add_dependencies(${target} ${RTM_PROJECT_NAME})
add_dependencies(${target} ${idl_name}_TGT)
- install(TARGETS ${target} RUNTIME DESTINATION ext/sdo/logger)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo/logger)
else()
if(VXWORKS)
set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
@@ -66,9 +66,9 @@
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ext/sdo/logger)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ext/sdo/logger)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo/logger)
endif(WIN32)
endif()
Modified: trunk/OpenRTM-aist/src/ext/ssl/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/ssl/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/src/ext/ssl/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -45,7 +45,7 @@
if(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION ext/ssl)
+ install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
else(WIN32)
- install(TARGETS ${target} LIBRARY DESTINATION ext/ssl)
+ install(TARGETS ${target} LIBRARY 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-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -159,35 +159,36 @@
include_directories(
${PROJECT_SOURCE_DIR}/common
${PROJECT_SOURCE_DIR}/${COIL_OS_DIR}
- ${PROJECT_BINARY_DIR}/..
)
#message(STATUS ${CMAKE_INCLUDE_DIRECTORIES_BEFORE})
if(VXWORKS)
add_library(${COIL_PROJECT_NAME} STATIC ${coil_srcs} )
- install(TARGETS ${COIL_PROJECT_NAME} ARCHIVE DESTINATION lib)
+ install(TARGETS ${COIL_PROJECT_NAME} ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR})
else(VXWORKS)
add_library(${COIL_PROJECT_NAME} SHARED ${coil_srcs} )
set_target_properties(${COIL_PROJECT_NAME} PROPERTIES DEBUG_POSTFIX d)
target_link_libraries(${COIL_PROJECT_NAME} ${RTM_LINKER_OPTION})
if(UNIX)
- install(TARGETS ${COIL_PROJECT_NAME} LIBRARY DESTINATION lib)
+ install(TARGETS ${COIL_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR})
elseif(WIN32)
set_source_files_properties(${DEF_FILE_NAME} PROPERTIES GENERATED 1)
add_dependencies(${COIL_PROJECT_NAME} ${COIL_PROJECT_NAME}_TGT)
add_dependencies(${COIL_PROJECT_NAME} ${COIL_PROJECT_NAME}_static)
- install(TARGETS ${COIL_PROJECT_NAME} RUNTIME DESTINATION bin)
+ install(TARGETS ${COIL_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR})
endif()
endif(VXWORKS)
-install(FILES ${coil_headers} DESTINATION include/coil)
+install(FILES ${coil_headers} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/coil)
#add_executable(coil ${coil_srcs} )
-install(FILES ${CMAKE_SOURCE_DIR}/build/makedeffile.py DESTINATION bin)
-install(FILES ${CMAKE_SOURCE_DIR}/build/setuptest.py DESTINATION bin)
-install(FILES ${CMAKE_SOURCE_DIR}/build/slntool.py DESTINATION bin)
-install(FILES ${CMAKE_SOURCE_DIR}/build/uuid.py DESTINATION bin)
-install(FILES ${CMAKE_SOURCE_DIR}/build/vcprojtool.py DESTINATION bin)
-install(FILES ${CMAKE_SOURCE_DIR}/build/vcxprojtool.py DESTINATION bin)
-install(FILES ${CMAKE_SOURCE_DIR}/build/yat.py DESTINATION bin)
+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})
Modified: trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -167,6 +167,7 @@
add_subdirectory(idl)
+
add_subdirectory(ext)
@@ -397,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 include/ext/sdo/observer)
+ install(FILES ${CMAKE_SOURCE_DIR}/src/ext/sdo/observer/ComponentObserverConsumer.h DESTINATION ${INSTALL_RTM_EXT_DIR}/sdo/observer)
endif(OBSERVER_ENABLE)
@@ -414,7 +415,13 @@
+
+
if(WIN32)
+ #FOREACH(filename ${SKEL_IDL_SRCS})
+ # set(skel_files ${skel_files} ${SKEL_IDL_DIR}/${filename})
+ #ENDFOREACH()
+
if(CMAKE_BUILD_TYPE MATCHES RELEASE)
set(DEF_FILE_NAME ${RTM_PROJECT_NAME}.def)
else()
@@ -422,9 +429,13 @@
endif()
#ADD_DEFINITIONS(-DLIBRARY_EXPORTS)
#add_library(${RTM_PROJECT_NAME}_static STATIC ${rtm_srcs} ${ALL_IDL_SRCS_RTM})
+
+ set(rtm_srcs ${rtm_srcs} ${SKEL_IDL_SRCS})
+ set_source_files_properties(${SKEL_IDL_SRCS} PROPERTIES GENERATED 1)
add_library(${RTM_PROJECT_NAME}_static STATIC ${rtm_srcs} )
- add_dependencies(${RTM_PROJECT_NAME}_static ${RTCSKEL_PROJECT_NAME})
- set_source_files_properties(${ALL_IDL_SRCS_RTM} PROPERTIES GENERATED 1)
+
+ add_dependencies(${RTM_PROJECT_NAME}_static ALL_IDL_TGT)
+ #add_dependencies(${RTM_PROJECT_NAME}_static ${RTCSKEL_PROJECT_NAME})
get_property(rtm_static_location TARGET ${RTM_PROJECT_NAME}_static PROPERTY LOCATION)
#message(STATUS ${rtm_static_location})
add_custom_command(OUTPUT ${DEF_FILE_NAME}
@@ -455,22 +466,34 @@
if(VXWORKS)
add_library(${RTM_PROJECT_NAME} STATIC ${rtm_srcs})
- install(TARGETS ${RTM_PROJECT_NAME} ARCHIVE DESTINATION lib)
+ install(TARGETS ${RTM_PROJECT_NAME} ARCHIVE DESTINATION ${INSTALL_RTM_BIN_DIR})
else(VXWORKS)
+
add_library(${RTM_PROJECT_NAME} SHARED ${rtm_srcs})
set_target_properties(${RTM_PROJECT_NAME} PROPERTIES DEBUG_POSTFIX d)
- target_link_libraries(${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME} ${RTM_LINKER_OPTION})
+
+
+
+
+
+
if(UNIX)
- install(TARGETS ${RTM_PROJECT_NAME} LIBRARY DESTINATION lib)
+ 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})
elseif(WIN32)
+ target_link_libraries(${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTM_LINKER_OPTION})
+ add_dependencies(${RTM_PROJECT_NAME} ALL_IDL_TGT)
set_source_files_properties(${DEF_FILE_NAME} PROPERTIES GENERATED 1)
add_dependencies(${RTM_PROJECT_NAME} ${RTM_PROJECT_NAME}_TGT)
add_dependencies(${RTM_PROJECT_NAME} ${RTM_PROJECT_NAME}_static)
- install(TARGETS ${RTM_PROJECT_NAME} RUNTIME DESTINATION bin)
+ install(TARGETS ${RTM_PROJECT_NAME} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR}
+ ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR}
+ RUNTIME DESTINATION ${INSTALL_RTM_LIB_DIR})
+
endif()
endif(VXWORKS)
-install(FILES ${rtm_headers} DESTINATION include/rtm)
+install(FILES ${rtm_headers} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm)
Modified: trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h 2018-11-06 05:23:34 UTC (rev 3431)
@@ -66,9 +66,14 @@
"naming.update.interval", "10.0",
"timer.enable", "YES",
"timer.tick", "0.1",
+#ifdef ORB_IS_OMNIORB
"corba.args", "-ORBclientCallTimeOutPeriod 10000",
+ "corba.endpoints", "all",
+#else
+ "corba.args", "",
+ "corba.endpoints", "",
+#endif
"corba.endpoint", "", // hostname:port_number
- "corba.endpoints", "all",
"corba.id", corba_name,
"corba.nameservers", "localhost",
"corba.master_manager", "localhost:2810",
Modified: trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp 2018-11-06 05:23:34 UTC (rev 3431)
@@ -1694,7 +1694,7 @@
}
else if (corba == "TAO")
{
- opt += "-ORBEndPoint iiop://" + endpoint;
+ opt += " -ORBEndPoint iiop://" + endpoint;
}
else if (corba == "MICO")
{
Modified: trunk/OpenRTM-aist/src/lib/rtm/ext/rtmCamera/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ext/rtmCamera/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/rtmCamera/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -85,19 +85,47 @@
+if(WIN32)
+ if(CMAKE_BUILD_TYPE MATCHES RELEASE)
+ set(DEF_FILE_NAME ${target}.def)
+ else()
+ set(DEF_FILE_NAME ${target}d.def)
+ endif()
+ add_library(${target}_static STATIC ${ALL_IDL_SRCS} )
+ add_dependencies(${target}_static ${RTCSKEL_PROJECT_NAME})
+ set_source_files_properties(${ALL_IDL_SRCS_RTM} PROPERTIES GENERATED 1)
+ get_property(rtm_static_location TARGET ${target}_static PROPERTY LOCATION)
+ add_custom_command(OUTPUT ${DEF_FILE_NAME}
+ COMMAND python ${MAKE_DEF_COMMAND} ${rtm_static_location} ${target} ${RTM_SHORT_VERSION} ${DEF_FILE_NAME}
+
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ )
+ add_custom_target(${target}_TGT DEPENDS ${DEF_FILE_NAME})
+ add_dependencies(${target}_TGT ${target}_static)
+ set(ALL_IDL_SRCS ${ALL_IDL_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/${DEF_FILE_NAME})
+endif(WIN32)
+
+
+
+
if(VXWORKS)
add_library(${target} SHARED ${ALL_IDL_SRCS})
- install(TARGETS ${RTM_PROJECT_NAME} ARCHIVE DESTINATION lib)
+ install(TARGETS ${RTM_PROJECT_NAME} ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR})
else(VXWORKS)
add_library(${target} SHARED ${ALL_IDL_SRCS})
set_target_properties(${target} PROPERTIES DEBUG_POSTFIX d)
target_link_libraries(${target} ${ORB_LIBRARIES} ${RTCSKEL_PROJECT_NAME})
if(UNIX)
- install(TARGETS ${target} LIBRARY DESTINATION lib)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR})
elseif(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION bin)
+ set_source_files_properties(${DEF_FILE_NAME} PROPERTIES GENERATED 1)
+ add_dependencies(${target} ${target}_TGT)
+ 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})
endif()
endif(VXWORKS)
@@ -113,7 +141,21 @@
add_dependencies(${target} ${RTCSKEL_PROJECT_NAME})
-install(FILES ${ALL_IDL_FILES} ${ALL_IDL_HEADERS} DESTINATION include/rtm/idl)
-
+install(FILES ${ALL_IDL_FILES} ${ALL_IDL_HEADERS} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/idl)
+foreach(idl ${idls})
+ if(CORBA STREQUAL "ORBexpress")
+ set(SKEL_STUB_HEADER_FILES ${SKEL_STUB_HEADER_FILES} ${PROJECT_BINARY_DIR}/${idl}.h ${PROJECT_BINARY_DIR}/${idl}_c.h)
+ set(SKEL_STUB_SOURCE_FILES ${SKEL_STUB_SOURCE_FILES} ${PROJECT_BINARY_DIR}/${idl}.cc ${PROJECT_BINARY_DIR}/${idl}_c.cc)
+ elseif(CORBA STREQUAL "omniORB")
+ set(SKEL_STUB_HEADER_FILES ${SKEL_STUB_HEADER_FILES} ${PROJECT_BINARY_DIR}/${idl}.hh)
+ set(SKEL_STUB_SOURCE_FILES ${SKEL_STUB_SOURCE_FILES} ${PROJECT_BINARY_DIR}/${idl}SK.cc ${PROJECT_BINARY_DIR}/${idl}DynSK.cc)
+ elseif(CORBA STREQUAL "TAO")
+ set(SKEL_STUB_HEADER_FILES ${SKEL_STUB_HEADER_FILES} ${PROJECT_BINARY_DIR}/${idl}S.h ${PROJECT_BINARY_DIR}/${idl}C.h ${PROJECT_BINARY_DIR}/${idl}C.inl)
+ set(SKEL_STUB_SOURCE_FILES ${SKEL_STUB_SOURCE_FILES} ${PROJECT_BINARY_DIR}/${idl}S.cpp ${PROJECT_BINARY_DIR}/${idl}C.cpp)
+ endif()
+endforeach(idl)
+install(FILES ${SKEL_STUB_HEADER_FILES} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/idl)
+
+
Modified: trunk/OpenRTM-aist/src/lib/rtm/ext/rtmManipulator/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ext/rtmManipulator/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/rtmManipulator/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -85,21 +85,48 @@
+if(WIN32)
+ if(CMAKE_BUILD_TYPE MATCHES RELEASE)
+ set(DEF_FILE_NAME ${target}.def)
+ else()
+ set(DEF_FILE_NAME ${target}d.def)
+ endif()
+ add_library(${target}_static STATIC ${ALL_IDL_SRCS} )
+ add_dependencies(${target}_static ${RTCSKEL_PROJECT_NAME})
+ set_source_files_properties(${ALL_IDL_SRCS_RTM} PROPERTIES GENERATED 1)
+ get_property(rtm_static_location TARGET ${target}_static PROPERTY LOCATION)
+ add_custom_command(OUTPUT ${DEF_FILE_NAME}
+ COMMAND python ${MAKE_DEF_COMMAND} ${rtm_static_location} ${target} ${RTM_SHORT_VERSION} ${DEF_FILE_NAME}
+
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ )
+ add_custom_target(${target}_TGT DEPENDS ${DEF_FILE_NAME})
+ add_dependencies(${target}_TGT ${target}_static)
+ set(ALL_IDL_SRCS ${ALL_IDL_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/${DEF_FILE_NAME})
+endif(WIN32)
+
+
+
if(VXWORKS)
add_library(${target} SHARED ${ALL_IDL_SRCS})
- install(TARGETS ${RTM_PROJECT_NAME} ARCHIVE DESTINATION lib)
+ install(TARGETS ${RTM_PROJECT_NAME} ARCHIVE DESTINATION ${INSTALL_RTM_LIB_DIR})
else(VXWORKS)
add_library(${target} SHARED ${ALL_IDL_SRCS})
set_target_properties(${target} PROPERTIES DEBUG_POSTFIX d)
target_link_libraries(${target} ${ORB_LIBRARIES} ${RTCSKEL_PROJECT_NAME})
if(UNIX)
- install(TARGETS ${target} LIBRARY DESTINATION lib)
+ install(TARGETS ${target} LIBRARY DESTINATION ${INSTALL_RTM_LIB_DIR})
elseif(WIN32)
- install(TARGETS ${target} RUNTIME DESTINATION bin)
+ set_source_files_properties(${DEF_FILE_NAME} PROPERTIES GENERATED 1)
+ add_dependencies(${target} ${target}_TGT)
+ 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})
endif()
endif(VXWORKS)
@@ -123,7 +150,21 @@
-install(FILES ${ALL_IDL_FILES} ${ALL_IDL_HEADERS} DESTINATION include/rtm/idl)
+install(FILES ${ALL_IDL_FILES} ${ALL_IDL_HEADERS} DESTINATION ${OPENRTM_VERSION}/rtm/idl)
+foreach(idl ${idls})
+ if(CORBA STREQUAL "ORBexpress")
+ set(SKEL_STUB_HEADER_FILES ${SKEL_STUB_HEADER_FILES} ${PROJECT_BINARY_DIR}/${idl}.h ${PROJECT_BINARY_DIR}/${idl}_c.h)
+ set(SKEL_STUB_SOURCE_FILES ${SKEL_STUB_SOURCE_FILES} ${PROJECT_BINARY_DIR}/${idl}.cc ${PROJECT_BINARY_DIR}/${idl}_c.cc)
+ elseif(CORBA STREQUAL "omniORB")
+ set(SKEL_STUB_HEADER_FILES ${SKEL_STUB_HEADER_FILES} ${PROJECT_BINARY_DIR}/${idl}.hh)
+ set(SKEL_STUB_SOURCE_FILES ${SKEL_STUB_SOURCE_FILES} ${PROJECT_BINARY_DIR}/${idl}SK.cc ${PROJECT_BINARY_DIR}/${idl}DynSK.cc)
+ elseif(CORBA STREQUAL "TAO")
+ set(SKEL_STUB_HEADER_FILES ${SKEL_STUB_HEADER_FILES} ${PROJECT_BINARY_DIR}/${idl}S.h ${PROJECT_BINARY_DIR}/${idl}C.h ${PROJECT_BINARY_DIR}/${idl}C.inl)
+ set(SKEL_STUB_SOURCE_FILES ${SKEL_STUB_SOURCE_FILES} ${PROJECT_BINARY_DIR}/${idl}S.cpp ${PROJECT_BINARY_DIR}/${idl}C.cpp)
+ endif()
+endforeach(idl)
+
+install(FILES ${SKEL_STUB_HEADER_FILES} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/idl)
\ No newline at end of file
Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -1,7 +1,7 @@
cmake_minimum_required (VERSION 2.6)
-project (RTCSkel)
+project (${RTCSKEL_PROJECT_NAME})
@@ -91,18 +91,45 @@
#set(ALL_IDL_SRCS ${ALL_IDL_SRCS} PARENT_SCOPE)
+
+
+
+
+
set_source_files_properties(${ALL_IDL_SRCS} PROPERTIES GENERATED 1)
+add_library(${RTCSKEL_PROJECT_NAME} STATIC ${ALL_IDL_SRCS} )
-add_library(RTCSkel STATIC ${ALL_IDL_SRCS} )
-
if(NOT TARGET ALL_IDL_TGT)
- add_custom_target(ALL_IDL_TGT)
-
+ add_custom_target(ALL_IDL_TGT)
endif(NOT TARGET ALL_IDL_TGT)
-add_dependencies(RTCSkel ALL_IDL_TGT)
+add_dependencies(${RTCSKEL_PROJECT_NAME} ALL_IDL_TGT)
-install(FILES ${ALL_IDL_FILES} ${ALL_IDL_HEADERS} DESTINATION include/rtm/idl)
+
+install(FILES ${ALL_IDL_FILES} ${ALL_IDL_HEADERS} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/idl)
+foreach(idl ${idls})
+ if(CORBA STREQUAL "ORBexpress")
+ set(SKEL_STUB_HEADER_FILES ${SKEL_STUB_HEADER_FILES} ${PROJECT_BINARY_DIR}/${idl}.h ${PROJECT_BINARY_DIR}/${idl}_c.h)
+ set(SKEL_STUB_SOURCE_FILES ${SKEL_STUB_SOURCE_FILES} ${PROJECT_BINARY_DIR}/${idl}.cc ${PROJECT_BINARY_DIR}/${idl}_c.cc)
+ elseif(CORBA STREQUAL "omniORB")
+ set(SKEL_STUB_HEADER_FILES ${SKEL_STUB_HEADER_FILES} ${PROJECT_BINARY_DIR}/${idl}.hh)
+ set(SKEL_STUB_SOURCE_FILES ${SKEL_STUB_SOURCE_FILES} ${PROJECT_BINARY_DIR}/${idl}SK.cc ${PROJECT_BINARY_DIR}/${idl}DynSK.cc)
+ elseif(CORBA STREQUAL "TAO")
+ set(SKEL_STUB_HEADER_FILES ${SKEL_STUB_HEADER_FILES} ${PROJECT_BINARY_DIR}/${idl}S.h ${PROJECT_BINARY_DIR}/${idl}C.h ${PROJECT_BINARY_DIR}/${idl}C.inl)
+ set(SKEL_STUB_SOURCE_FILES ${SKEL_STUB_SOURCE_FILES} ${PROJECT_BINARY_DIR}/${idl}S.cpp ${PROJECT_BINARY_DIR}/${idl}C.cpp)
+ endif()
+endforeach(idl)
+
+
+install(FILES ${SKEL_STUB_HEADER_FILES} DESTINATION ${INSTALL_RTM_INCLUDE_DIR}/rtm/idl)
+
+
+
+if(WIN32)
+ 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
Modified: trunk/OpenRTM-aist/utils/cmake/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/cmake/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/utils/cmake/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -3,11 +3,33 @@
-set(OPENRTM_CFLAGS ${ORB_C_FLAGS_LIST})
-set(OPENRTM_LIBRARIES optimized;RTC${RTM_SHORT_VERSION}_${RTM_VC_VER};optimized;coil${RTM_SHORT_VERSION}_${RTM_VC_VER};optimized;advapi32;optimized;ws2_32;optimized;mswsock;optimized;rtmCamera${RTM_SHORT_VERSION}_${RTM_VC_VER};optimized;rtmManipulator${RTM_SHORT_VERSION}_${RTM_VC_VER};debug;RTC${RTM_SHORT_VERSION}_${RTM_VC_VER}d;debug;coil${RTM_SHORT_VERSION}_${RTM_VC_VER}d;debug;advapi32;debug;ws2_32;debug;mswsock;debug;rtmCamera${RTM_SHORT_VERSION}_${RTM_VC_VER}d;debug;rtmManipulator${RTM_SHORT_VERSION}_${RTM_VC_VER}d;${ORB_LIBRARIES})
+#set(OPENRTM_CFLAGS ${ORB_C_FLAGS_LIST})
+#set(OPENRTM_LIBRARIES optimized;RTC${RTM_SHORT_VERSION}_${RTM_VC_VER};optimized;coil${RTM_SHORT_VERSION}_${RTM_VC_VER};optimized;advapi32;optimized;ws2_32;optimized;mswsock;optimized;rtmCamera${RTM_SHORT_VERSION}_${RTM_VC_VER};optimized;rtmManipulator${RTM_SHORT_VERSION}_${RTM_VC_VER};debug;RTC${RTM_SHORT_VERSION}_${RTM_VC_VER}d;debug;coil${RTM_SHORT_VERSION}_${RTM_VC_VER}d;debug;advapi32;debug;ws2_32;debug;mswsock;debug;rtmCamera${RTM_SHORT_VERSION}_${RTM_VC_VER}d;debug;rtmManipulator${RTM_SHORT_VERSION}_${RTM_VC_VER}d;${ORB_LIBRARIES})
+if(CORBA STREQUAL "ORBexpress")
+elseif(CORBA STREQUAL "omniORB")
+ set(OMNIORB_VERSION "${OMNI_VERSION1}.${OMNI_VERSION2}.${OMNI_MINOR}")
+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(VXWORKS)
elseif(UNIX)
elseif(MSVC)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OpenRTMFind_win.cmake.in ${PROJECT_BINARY_DIR}/OpenRTMFind.cmake @ONLY)
-endif(VXWORKS)
\ No newline at end of file
+ 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})
+ 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)
+ elseif(CORBA STREQUAL "TAO")
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OpenRTMConfig_TAO.cmake.in ${PROJECT_BINARY_DIR}/cmake/OpenRTMConfig.cmake @ONLY)
+ 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.cmake.in
===================================================================
--- trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig.cmake.in (rev 0)
+++ trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig.cmake.in 2018-11-06 05:23:34 UTC (rev 3431)
@@ -0,0 +1,70 @@
+# -*- cmake -*-
+#
+# OpenRTM-aist CMake configuration file.
+#
+# @file OpenRTMConfig.cmake
+#
+# This file is used for cmake config-mode.
+
+
+message(STATUS "OpenRTMConfig.cmake found.")
+message(STATUS "CMAKE_GENERATOR check mode.")
+
+
+
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008")
+ set(RTM_VC_VER "vc9")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 10 2010")
+ set(RTM_VC_VER "vc10")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 10 2010 Win64")
+ set(RTM_VC_VER "vc10")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 11 2012")
+ set(RTM_VC_VER "vc11")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 11 2012 Win64")
+ set(RTM_VC_VER "vc11")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 2013")
+ set(RTM_VC_VER "vc12")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 2013 Win64")
+ set(RTM_VC_VER "vc12")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015")
+ set(RTM_VC_VER "vc14")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015 Win64")
+ set(RTM_VC_VER "vc14")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 15 2017")
+ set(RTM_VC_VER "vc141")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 15 2017 Win64")
+ set(RTM_VC_VER "vc141")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 11 2012 ARM")
+ set(RTM_VC_VER "vc11")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 2013 ARM")
+ set(RTM_VC_VER "vc12")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015 ARM")
+ set(RTM_VC_VER "vc14")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 15 2017 ARM")
+ set(RTM_VC_VER "vc141")
+endif()
+
+
+MESSAGE(STATUS "VC version is : ${CMAKE_GENERATOR}")
+
+
+get_filename_component(OpenRTM_CONFIG_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH CACHE)
+set(OPENRTM_DIR "${OpenRTM_CONFIG_PATH}/../")
+
+include("${OPENRTM_DIR}/bin/${RTM_VC_VER}/OpenRTMConfig.cmake")
+
+# end of OpenRTMConfig.cmake
\ No newline at end of file
Added: trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig_TAO.cmake.in
===================================================================
--- trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig_TAO.cmake.in (rev 0)
+++ trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig_TAO.cmake.in 2018-11-06 05:23:34 UTC (rev 3431)
@@ -0,0 +1,127 @@
+# -*- cmake -*-
+#
+# @file OpenRTMConfig.cmake
+# @brief cmake-config file for OpenRTM-aist on Windows
+# @date Fri Mar 30 14:55:25 2018
+#
+# 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-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.")
+
+# 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_VERSION@)
+
+#get_filename_component(OPENRTM_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+#set(OPENRTM_DIR "${OPENRTM_DIR}../..")
+string(REGEX REPLACE "/$" "" OPENRTM_DIR "${OPENRTM_DIR}")
+
+# TAO version
+set(OMNIORB_DIR "${OPENRTM_DIR}/ACE/${RTM_VC_VER}")
+set(OMNIORB_CFLAGS @ORB_C_FLAGS_LIST@;)
+set(OMNIORB_INCLUDE_DIRS ${OMNIORB_DIR} ${OMNIORB_DIR}/TAO ${OMNIORB_DIR}/TAO/orbsvcs)
+set(OMNIORB_LDFLAGS )
+set(OMNIORB_LIBRARY_DIRS ${OMNIORB_DIR}/lib)
+set(OMNIORB_LIBRARIES @ORB_LIBRARIES@)
+
+
+# Basic compiler/linker options
+set(OPENRTM_CFLAGS @ORB_C_FLAGS_LIST@;)
+set(OPENRTM_INCLUDE_DIRS ${OPENRTM_DIR};${OPENRTM_DIR}/rtm/idl;${OPENRTM_DIR}/rtm/ext)
+set(OPENRTM_LDFLAGS )
+
+
+
+get_filename_component(OpenRTM_CONFIG2_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH CACHE)
+set(OPENRTM_BIN_PATH "${OPENRTM_DIR}/bin")
+file(GLOB rtm_libs "${OpenRTM_CONFIG2_PATH}/RTC*.lib")
+foreach(rtm_lib ${rtm_libs})
+ if(EXISTS "${rtm_lib}")
+ set(OPENRTM_BIN_PATH ${OpenRTM_CONFIG2_PATH})
+ endif()
+endforeach()
+message(STATUS "OPENRTM_BIN_PATH=${OPENRTM_BIN_PATH}")
+
+
+set(OPENRTM_LIBRARY_DIRS ${OPENRTM_BIN_PATH};${OMNIORB_DIR}/lib/@ARCH_NAME@)
+set(OPENRTM_LIBRARIES @OPENRTM_LIBRARIES@;${OMNIORB_LIBRARIES})
+
+
+
+
+# OpenRTM-aist specific directory
+set(COIL_INCLUDE_DIR ${OPENRTM_DIR}/bin)
+
+# OpenRTM-aist's CORBA related settings
+set(OPENRTM_ORB TAO)
+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)
+
+
+message(STATUS "OpenRTM-aist configuration done")
+
+message(STATUS " OMNIORB_DIR=${OMNIORB_DIR}")
+message(STATUS " OMNIORB_VERSION=${OMNIORB_VERSION}")
+message(STATUS " OMNIORB_CFLAGS=${OMNIORB_CFLAGS}")
+message(STATUS " OMNIORB_INCLUDE_DIRS=${OMNIORB_INCLUDE_DIRS}")
+message(STATUS " OMNIORB_LDFLAGS=${OMNIORB_LDFLAGS}")
+message(STATUS " OMNIORB_LIBRARY_DIRS=${OMNIORB_LIBRARY_DIRS}")
+message(STATUS " OMNIORB_LIBRARIES=${OMNIORB_LIBRARIES}")
+
+message(STATUS " OPENRTM_DIR=${OPENRTM_DIR}")
+message(STATUS " OPENRTM_VERSION=${OPENRTM_VERSION}")
+message(STATUS " OPENRTM_VERSION_MAJOR=${OPENRTM_VERSION_MAJOR}")
+message(STATUS " OPENRTM_VERSION_MINOR=${OPENRTM_VERSION_MINOR}")
+message(STATUS " OPENRTM_VERSION_PATCH=${OPENRTM_VERSION_PATCH}")
+message(STATUS " OPENRTM_CFLAGS=${OPENRTM_CFLAGS}")
+message(STATUS " OPENRTM_INCLUDE_DIRS=${OPENRTM_INCLUDE_DIRS}")
+message(STATUS " OPENRTM_LDFLAGS=${OPENRTM_LDFLAGS}")
+message(STATUS " OPENRTM_LIBRARY_DIRS=${OPENRTM_LIBRARY_DIRS}")
+message(STATUS " OPENRTM_LIBRARIES=${OPENRTM_LIBRARIES}")
+
+message(STATUS " OPENRTM_IDLC=${OPENRTM_IDLC}")
+message(STATUS " OPENRTM_IDLFLAGS=${OPENRTM_IDLFLAGS}")
+message(STATUS " OPENRTM_IDL_WRAPPER=${OPENRTM_IDL_WRAPPER}")
+message(STATUS " OPENRTM_IDL_WRAPPER_FLAGS=${OPENRTM_IDL_WRAPPER_FLAGS}")
+
+# end of OpenRTMConfig.cmake
+
+
Added: trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig_omniORB.cmake.in
===================================================================
--- trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig_omniORB.cmake.in (rev 0)
+++ trunk/OpenRTM-aist/utils/cmake/OpenRTMConfig_omniORB.cmake.in 2018-11-06 05:23:34 UTC (rev 3431)
@@ -0,0 +1,128 @@
+# -*- cmake -*-
+#
+# @file OpenRTMConfig.cmake
+# @brief cmake-config file for OpenRTM-aist on Windows
+# @date Fri Mar 30 14:55:25 2018
+#
+# 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-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.")
+
+# 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_VERSION@)
+
+#get_filename_component(OPENRTM_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+#set(OPENRTM_DIR "${OPENRTM_DIR}../..")
+string(REGEX REPLACE "/$" "" OPENRTM_DIR "${OPENRTM_DIR}")
+
+# omniORB version
+set(OMNIORB_VERSION @OMNIORB_VERSION@)
+set(OMNIORB_DIR "${OPENRTM_DIR}/omniORB/${OMNIORB_VERSION}_${RTM_VC_VER}")
+set(OMNIORB_CFLAGS @ORB_C_FLAGS_LIST@;-D__NT__;-D__OSVERSION__=4;-D_CRT_SECURE_NO_DEPRECATE)
+set(OMNIORB_INCLUDE_DIRS ${OMNIORB_DIR}/include)
+set(OMNIORB_LDFLAGS )
+set(OMNIORB_LIBRARY_DIRS ${OMNIORB_DIR}/lib/@ARCH_NAME@)
+set(OMNIORB_LIBRARIES @ORB_LIBRARIES@)
+
+
+# Basic compiler/linker options
+set(OPENRTM_CFLAGS @ORB_C_FLAGS_LIST@;-D__OSVERSION__=4;-D_CRT_SECURE_NO_DEPRECATE;-DINCLUDE_stub_in_nt_dll;-DRTC_CORBA_CXXMAPPING11;-D_WIN32_WINNT=0x0500)
+set(OPENRTM_INCLUDE_DIRS ${OPENRTM_DIR};${OPENRTM_DIR}/rtm/idl;${OPENRTM_DIR}/rtm/ext)
+set(OPENRTM_LDFLAGS )
+
+
+
+get_filename_component(OpenRTM_CONFIG2_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH CACHE)
+set(OPENRTM_BIN_PATH "${OPENRTM_DIR}/bin")
+file(GLOB rtm_libs "${OpenRTM_CONFIG2_PATH}/RTC*.lib")
+foreach(rtm_lib ${rtm_libs})
+ if(EXISTS "${rtm_lib}")
+ set(OPENRTM_BIN_PATH ${OpenRTM_CONFIG2_PATH})
+ endif()
+endforeach()
+message(STATUS "OPENRTM_BIN_PATH=${OPENRTM_BIN_PATH}")
+
+
+set(OPENRTM_LIBRARY_DIRS ${OPENRTM_BIN_PATH};${OMNIORB_DIR}/lib/@ARCH_NAME@)
+set(OPENRTM_LIBRARIES @OPENRTM_LIBRARIES@;${OMNIORB_LIBRARIES})
+
+
+
+
+# OpenRTM-aist specific directory
+set(COIL_INCLUDE_DIR ${OPENRTM_DIR}/bin)
+
+# OpenRTM-aist's CORBA related settings
+set(OPENRTM_ORB omniORB)
+set(OPENRTM_IDL_WRAPPER rtm-skelwrapper.py)
+set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="";--skel-suffix=Skel;--stub-suffix=Stub)
+set(OPENRTM_IDLC omniidl)
+set(OPENRTM_IDLFLAGS -bcxx;-Wba;-nf;-Wbshortcut;-I${OPENRTM_DIR}/rtm/idl)
+
+
+message(STATUS "OpenRTM-aist configuration done")
+
+message(STATUS " OMNIORB_DIR=${OMNIORB_DIR}")
+message(STATUS " OMNIORB_VERSION=${OMNIORB_VERSION}")
+message(STATUS " OMNIORB_CFLAGS=${OMNIORB_CFLAGS}")
+message(STATUS " OMNIORB_INCLUDE_DIRS=${OMNIORB_INCLUDE_DIRS}")
+message(STATUS " OMNIORB_LDFLAGS=${OMNIORB_LDFLAGS}")
+message(STATUS " OMNIORB_LIBRARY_DIRS=${OMNIORB_LIBRARY_DIRS}")
+message(STATUS " OMNIORB_LIBRARIES=${OMNIORB_LIBRARIES}")
+
+message(STATUS " OPENRTM_DIR=${OPENRTM_DIR}")
+message(STATUS " OPENRTM_VERSION=${OPENRTM_VERSION}")
+message(STATUS " OPENRTM_VERSION_MAJOR=${OPENRTM_VERSION_MAJOR}")
+message(STATUS " OPENRTM_VERSION_MINOR=${OPENRTM_VERSION_MINOR}")
+message(STATUS " OPENRTM_VERSION_PATCH=${OPENRTM_VERSION_PATCH}")
+message(STATUS " OPENRTM_CFLAGS=${OPENRTM_CFLAGS}")
+message(STATUS " OPENRTM_INCLUDE_DIRS=${OPENRTM_INCLUDE_DIRS}")
+message(STATUS " OPENRTM_LDFLAGS=${OPENRTM_LDFLAGS}")
+message(STATUS " OPENRTM_LIBRARY_DIRS=${OPENRTM_LIBRARY_DIRS}")
+message(STATUS " OPENRTM_LIBRARIES=${OPENRTM_LIBRARIES}")
+
+message(STATUS " OPENRTM_IDLC=${OPENRTM_IDLC}")
+message(STATUS " OPENRTM_IDLFLAGS=${OPENRTM_IDLFLAGS}")
+message(STATUS " OPENRTM_IDL_WRAPPER=${OPENRTM_IDL_WRAPPER}")
+message(STATUS " OPENRTM_IDL_WRAPPER_FLAGS=${OPENRTM_IDL_WRAPPER_FLAGS}")
+
+# end of OpenRTMConfig.cmake
+
+
Modified: trunk/OpenRTM-aist/utils/rtcd/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtcd/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/utils/rtcd/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -44,4 +44,4 @@
endif(VXWORKS)
-install(TARGETS ${target} RUNTIME DESTINATION bin)
+install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
\ No newline at end of file
Modified: trunk/OpenRTM-aist/utils/rtcprof/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtcprof/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/utils/rtcprof/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -50,4 +50,4 @@
endif(VXWORKS)
-install(TARGETS ${target} RUNTIME DESTINATION bin)
+install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
Modified: trunk/OpenRTM-aist/utils/rtcsh/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtcsh/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/utils/rtcsh/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -23,4 +23,4 @@
target_link_libraries(${target} ${libs} ${RTM_LINKER_OPTION})
-install(TARGETS ${target} RUNTIME DESTINATION bin)
+install(TARGETS ${target} RUNTIME DESTINATION ${INSTALL_RTM_BIN_DIR})
Modified: trunk/OpenRTM-aist/utils/rtm-skelwrapper/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/utils/rtm-skelwrapper/CMakeLists.txt 2018-11-01 09:40:34 UTC (rev 3430)
+++ trunk/OpenRTM-aist/utils/rtm-skelwrapper/CMakeLists.txt 2018-11-06 05:23:34 UTC (rev 3431)
@@ -2,10 +2,10 @@
if(UNIX)
- install(FILES rtm-skelwrapper DESTINATION bin)
+ install(FILES rtm-skelwrapper DESTINATION ${INSTALL_RTM_BIN_DIR})
elseif(MSVC)
configure_file(rtm-skelwrapper ${PROJECT_BINARY_DIR}/rtm-skelwrapper.py COPYONLY)
- install(FILES ${PROJECT_BINARY_DIR}/rtm-skelwrapper.py DESTINATION bin)
+ install(FILES ${PROJECT_BINARY_DIR}/rtm-skelwrapper.py DESTINATION ${INSTALL_RTM_BIN_DIR})
endif(UNIX)
-install(FILES skel_wrapper.py DESTINATION bin)
\ No newline at end of file
+install(FILES skel_wrapper.py DESTINATION ${INSTALL_RTM_BIN_DIR})
\ No newline at end of file
openrtm-commit メーリングリストの案内