Merge pull request #104 from fkanehiro/openrtm_trunk

supports trunk version of OpenRTM-aist
fkanehiro · Jun 22, 2016 · 781669f · 781669f
2 parents a764696 + 84d4a7e
commit 781669f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -268,6 +268,9 @@ set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS} CACHE STRING "Compile flags for omniORB")
 
 # OpenRTM-aist
 find_package(OpenRTM REQUIRED)
+if(EXISTS "${OPENRTM_DIR}/include/openrtm-1.1/rtm/RTObjectStateMachine.h")
+add_definitions(-DOPENRTM_VERSION_TRUNK)
+endif()
 set(ADDITIONAL_SYMBOL "")
 include_directories(${OPENRTM_INCLUDE_DIRS})
 link_directories(${OPENRTM_LIBRARY_DIRS})

diff --git a/hrplib/hrpRTM/SimulationExecutionContext.cpp b/hrplib/hrpRTM/SimulationExecutionContext.cpp
@@ -1,5 +1,5 @@
 #include <rtm/CorbaNaming.h>
-#if !defined(OPENRTM_VERSION042) && !defined(OPENRTM_VERSION110)
+#if (!defined(OPENRTM_VERSION042) && !defined(OPENRTM_VERSION110)) || defined(OPENRTM_VERSION_TRUNK)
 #include <rtm/Manager.h>
 #endif
 #include "SimulationExecutionContext.h"
@@ -21,7 +21,7 @@ namespace RTC
 
   ReturnCode_t SimulationExecutionContext::stop() throw (CORBA::SystemException)
   {
-#if defined(OPENRTM_VERSION042) || defined(OPENRTM_VERSION110)
+#if (defined(OPENRTM_VERSION042) || defined(OPENRTM_VERSION110)) && !defined(OPENRTM_VERSION_TRUNK)
     if (!m_running) return RTC::PRECONDITION_NOT_MET;
 
      OpenRTM::ExtTrigExecutionContextService_var extTrigExecContext =