supports OpenRTM-aist 1.2.0

fkanehiro · Dec 2, 2016 · c04e929 · c04e929
1 parent ecb7372
commit c04e929
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -295,6 +295,8 @@ endif()
 if(UNIX)
   if(OPENRTM_VERSION STREQUAL OPENRTM_VERSION110 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION111 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION112)
     set(OPENRTM_IDL_DIR "${OPENRTM_DIR}/include/openrtm-1.1/rtm/idl")
+  elseif(OPENRTM_VERSION STREQUAL OPENRTM_VERSION120)
+    set(OPENRTM_IDL_DIR "${OPENRTM_DIR}/include/openrtm-1.2/rtm/idl")
   else()
     set(OPENRTM_IDL_DIR "${OPENRTM_DIR}/include/rtm/idl")
   endif()

diff --git a/cmake_modules/FindOpenRTM.cmake b/cmake_modules/FindOpenRTM.cmake
@@ -9,6 +9,7 @@ set(OPENRTM_VERSION102 "1.0.2")
 set(OPENRTM_VERSION110 "1.1.0")
 set(OPENRTM_VERSION111 "1.1.1")
 set(OPENRTM_VERSION112 "1.1.2")
+set(OPENRTM_VERSION120 "1.2.0")
 set(OPENRTM_PKG_CONFIG_FOUND FALSE)
 #Additional threshold OpenRTM versions switching processing 
 set(OPENRTM_DEFAULT_VERSION ${OPENRTM_VERSION100})
@@ -50,7 +51,11 @@ if(UNIX)
 	 if(OPENRTM_VERSION STREQUAL OPENRTM_VERSION110 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION111 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION112)
           list(APPEND OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}/include/openrtm-1.1/rtm/idl")
           list(APPEND OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}/include/openrtm-1.1")
-	   list(APPEND OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}/include/coil-1.1")
+	  list(APPEND OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}/include/coil-1.1")
+	elseif(OPENRTM_VERSION STREQUAL OPENRTM_VERSION120)
+	  list(APPEND OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}/include/openrtm-1.2/rtm/idl")
+	  list(APPEND OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}/include/openrtm-1.2")
+	  list(APPEND OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}/include/coil-1.2")
         else()
           list(APPEND OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}/include/rtm/idl")
           list(APPEND OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}/include")

diff --git a/idl/OpenRTM/CMakeLists.txt b/idl/OpenRTM/CMakeLists.txt
@@ -1,4 +1,4 @@
-if( OPENRTM_VERSION STREQUAL OPENRTM_VERSION110 )
+if( OPENRTM_VERSION STREQUAL OPENRTM_VERSION110 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION120)
   ADD_SUBDIRECTORY(1.1.0)
 elseif( OPENRTM_VERSION STREQUAL OPENRTM_VERSION100 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION101 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION102 )
   ADD_SUBDIRECTORY(1.0.0)