Merge pull request #84 from jenkinshrg/add-openrtm-new-version

add configuration for openrtm ver-1.1.2
fkanehiro · Nov 25, 2015 · b344c1e · b344c1e
2 parents eaf23dc + af75cf9
commit b344c1e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -272,20 +272,20 @@ endif()
 
 if( OPENRTM_VERSION STREQUAL OPENRTM_VERSION100 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION101 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION102)
   set(OPENHRP_RTM_IDL_DIR "${OpenHRP_SOURCE_DIR}/idl/OpenRTM/${OPENRTM_VERSION100}")
-elseif( OPENRTM_VERSION STREQUAL OPENRTM_VERSION110 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION111 )
+elseif( OPENRTM_VERSION STREQUAL OPENRTM_VERSION110 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION111 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION112 )
   set(OPENHRP_RTM_IDL_DIR "${OpenHRP_SOURCE_DIR}/idl/OpenRTM/${OPENRTM_VERSION110}")
 else()
   set(OPENHRP_RTM_IDL_DIR "${OpenHRP_SOURCE_DIR}/idl/OpenRTM/${OPENRTM_VERSION}")
 endif()
 
 if( OPENRTM_VERSION STREQUAL OPENRTM_VERSION042 )
   set(ADDITIONAL_SYMBOL "OPENRTM_VERSION_042")
-elseif( OPENRTM_VERSION STREQUAL OPENRTM_VERSION100 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION110 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION111 )
+elseif( OPENRTM_VERSION STREQUAL OPENRTM_VERSION100 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION110 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION111 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION112 )
   set(ADDITIONAL_SYMBOL "OPENRTM_VERSION110")
 endif()
 
 if(UNIX)
-  if(OPENRTM_VERSION STREQUAL OPENRTM_VERSION110 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION111)
+  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")
   else()
     set(OPENRTM_IDL_DIR "${OPENRTM_DIR}/include/rtm/idl")

diff --git a/cmake_modules/FindOpenRTM.cmake b/cmake_modules/FindOpenRTM.cmake
@@ -8,6 +8,7 @@ set(OPENRTM_VERSION101 "1.0.1")
 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_PKG_CONFIG_FOUND FALSE)
 #Additional threshold OpenRTM versions switching processing 
 set(OPENRTM_DEFAULT_VERSION ${OPENRTM_VERSION100})
@@ -46,7 +47,7 @@ if(UNIX)
 
     if(RESULT EQUAL 0)
       if(OPENRTM_DIR)
-	 if(OPENRTM_VERSION STREQUAL OPENRTM_VERSION110 OR OPENRTM_VERSION STREQUAL OPENRTM_VERSION111)
+	 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")