[openrtm-commit:00886] r347 - trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake
openrtm @ openrtm.org
openrtm @ openrtm.org
2012年 9月 2日 (日) 02:02:16 JST
Author:
Date: 2012-09-02 02:02:16 +0900 (Sun, 02 Sep 2012)
New Revision: 347
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl
Log:
Modified FindOpenRTM.cmake
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl 2012-08-27 11:57:45 UTC (rev 346)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl 2012-09-01 17:02:16 UTC (rev 347)
@@ -31,7 +31,7 @@
pkg_check_modules(PC_OPENRTM openrtm-aist)
pkg_check_modules(PC_COIL libcoil)
pkg_check_modules(PC_OMNIORB4 omniORB4)
-pkg_check_modules(PC_OMNITHREAD omnithread)
+pkg_check_modules(PC_OMNITHREAD3 omnithread3)
pkg_check_modules(PC_OMNIDYNAMIC4 omniDynamic4)
pkg_check_modules(PC_UUID uuid)
@@ -52,8 +52,8 @@
${dol}{PC_COIL_LIBRARY_DIRS})
find_library(OMNIORB4_LIBRARY omniORB4
HINTS ${dol}{PC_OMNIORB4_LIBRARY_DIRS})
-find_library(OMNITHREAD_LIBRARY omnithread
- HINTS ${dol}{PC_OMNITHREAD_LIBRARY_DIRS})
+find_library(OMNITHREAD3_LIBRARY omnithread
+ HINTS ${dol}{PC_OMNITHREAD3_LIBRARY_DIRS})
find_library(OMNIDYNAMIC4_LIBRARY omniDynamic4
HINTS ${dol}{PC_OMNIDYNAMIC4_LIBRARY_DIRS})
find_library(UUID_LIBRARY uuid
@@ -62,7 +62,7 @@
set(OPENRTM_CFLAGS ${dol}{PC_OPENRTM_CFLAGS_OTHER} ${dol}{PC_COIL_CFLAGS_OTHER} ${dol}{PC_OMNIORB4_CFLAGS_OTHER})
set(OPENRTM_INCLUDE_DIRS ${dol}{OPENRTM_INCLUDE_DIR} ${dol}{OPENRTM_INCLUDE_DIR}/rtm/idl
${dol}{COIL_INCLUDE_DIR} ${dol}{OMNIORB4_INCLUDE_DIR})
-set(OPENRTM_LIBRARIES ${dol}{OPENRTM_LIBRARY} ${dol}{COIL_LIBRARY} ${dol}{OMNIORB4_LIBRARY} ${dol}{OMNITHREAD_LIBRARY} ${dol}{OMNIDYNAMIC4_LIBRARY} ${dol}{UUID_LIBRARY} dl pthread)
+set(OPENRTM_LIBRARIES ${dol}{OPENRTM_LIBRARY} ${dol}{COIL_LIBRARY} ${dol}{OMNIORB4_LIBRARY} ${dol}{OMNITHREAD3_LIBRARY} ${dol}{OMNIDYNAMIC4_LIBRARY} ${dol}{UUID_LIBRARY} dl pthread)
file(STRINGS ${dol}{OPENRTM_INCLUDE_DIR}/rtm/version.h OPENRTM_VERSION
NEWLINE_CONSUME)
More information about the openrtm-commit
mailing list