[openrtm-commit:00081] r178 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder: META-INF resource/100/CXX/build/cmake1/cmake_modules resource/100/CXX/build/cmake2/cmake_modules src/jp/go/aist/rtm/rtcbuilder/template/cmake

[openrtm ＠ openrtm.org]

Author: ta
Date: 2011-05-23 14:13:32 +0900 (Mon, 23 May 2011)
New Revision: 178

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/cmake_modules/FindOpenRTM.cmake
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/cmake_modules/FindOpenRTM.cmake
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl
Log:
RTCB updates.

- fix openrtm version checking in cmake configuration.

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF	2011-05-20 03:55:10 UTC (rev 177)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF	2011-05-23 05:13:32 UTC (rev 178)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: jp.go.aist.rtm.rtcbuilder; singleton:=true
-Bundle-Version: 1.1.0.v20110520
+Bundle-Version: 1.1.0.v20110523
 Bundle-ClassPath: .,
  lib/velocity-1.6.3-dep.jar
 Bundle-Vendor: %providerName

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/cmake_modules/FindOpenRTM.cmake
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/cmake_modules/FindOpenRTM.cmake	2011-05-20 03:55:10 UTC (rev 177)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/cmake_modules/FindOpenRTM.cmake	2011-05-23 05:13:32 UTC (rev 178)
@@ -134,6 +134,8 @@
     string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\2" OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
     set(OPENRTM_VERSION_PATCH "0")
     set(OPENRTM_VERSION "${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}.${OPENRTM_VERSION_PATCH}")
+    string(REGEX REPLACE "[.]" ""
+           OPENRTM_VERSION_NUM "${OPENRTM_VERSION}")
 
     set(OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}")
     set(OPENRTM_LIBRARY_DIRS "${OPENRTM_DIR}/bin")
@@ -141,7 +143,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC100" "coil")
+    foreach(library "RTC${OPENRTM_VERSION_NUM}" "coil")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/cmake_modules/FindOpenRTM.cmake
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/cmake_modules/FindOpenRTM.cmake	2011-05-20 03:55:10 UTC (rev 177)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/cmake_modules/FindOpenRTM.cmake	2011-05-23 05:13:32 UTC (rev 178)
@@ -134,6 +134,8 @@
     string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\2" OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
     set(OPENRTM_VERSION_PATCH "0")
     set(OPENRTM_VERSION "${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}.${OPENRTM_VERSION_PATCH}")
+    string(REGEX REPLACE "[.]" ""
+           OPENRTM_VERSION_NUM "${OPENRTM_VERSION}")
 
     set(OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}")
     set(OPENRTM_LIBRARY_DIRS "${OPENRTM_DIR}/bin")
@@ -141,7 +143,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC100" "coil")
+    foreach(library "RTC${OPENRTM_VERSION_NUM}" "coil")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl	2011-05-20 03:55:10 UTC (rev 177)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl	2011-05-23 05:13:32 UTC (rev 178)
@@ -134,6 +134,8 @@
     string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\2" OPENRTM_VERSION_MINOR "${dol}{OPENRTM_VERSION}")
     set(OPENRTM_VERSION_PATCH "0")
     set(OPENRTM_VERSION "${dol}{OPENRTM_VERSION_MAJOR}.${dol}{OPENRTM_VERSION_MINOR}.${dol}{OPENRTM_VERSION_PATCH}")
+    string(REGEX REPLACE "[.]" ""
+           OPENRTM_VERSION_NUM "${dol}{OPENRTM_VERSION}")
 
     set(OPENRTM_INCLUDE_DIRS "${dol}{OPENRTM_DIR}")
     set(OPENRTM_LIBRARY_DIRS "${dol}{OPENRTM_DIR}/bin")
@@ -141,7 +143,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC100" "coil")
+    foreach(library "RTC${dol}{OPENRTM_VERSION_NUM}" "coil")
         list(APPEND OPENRTM_LIBRARIES optimized "${dol}{library}" debug "${dol}{library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")