[openrtm-commit:00885] r346 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder: manager template/cmake/cmake

[openrtm ＠ openrtm.org]

Author: 
Date: 2012-08-27 20:57:45 +0900 (Mon, 27 Aug 2012)
New Revision: 346

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java
   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/manager/CMakeGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java	2012-08-16 04:53:57 UTC (rev 345)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java	2012-08-27 11:57:45 UTC (rev 346)
@@ -220,21 +220,24 @@
 
 	public GeneratedResult generateCmakeConfigVersion(Map<String, Object> contextMap) {
 		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = "cmake/" + rtcParam.getName() + "-config-version.cmake.in";
+		//TODO 暫定処理
+		String outfile = "cmake/" + rtcParam.getName().toLowerCase() + "-config-version.cmake.in";
 		String infile = "cmake/cmake/config_version.cmake.in.vsl";
 		return generate(infile, outfile, contextMap);
 	}
 	
 	public GeneratedResult generateCmakeConfig(Map<String, Object> contextMap) {
 		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = "cmake/" + rtcParam.getName() + "-config.cmake.in";
+		//TODO 暫定処理
+		String outfile = "cmake/" + rtcParam.getName().toLowerCase() + "-config.cmake.in";
 		String infile = "cmake/cmake/config.cmake.in.vsl";
 		return generate(infile, outfile, contextMap);
 	}
 
 	public GeneratedResult generateCmakePcIn(Map<String, Object> contextMap) {
 		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = "cmake/" + rtcParam.getName() + ".pc.in";
+		//TODO 暫定処理
+		String outfile = "cmake/" + rtcParam.getName().toLowerCase() + ".pc.in";
 		String infile = "cmake/cmake/pc.in.vsl";
 		return generate(infile, outfile, contextMap);
 	}

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-16 04:53:57 UTC (rev 345)
+++ 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)
@@ -30,25 +30,39 @@
 find_package(PkgConfig)
 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_OMNIDYNAMIC4 omniDynamic4)
+pkg_check_modules(PC_UUID uuid)
 
 find_path(OPENRTM_INCLUDE_DIR rtm/RTC.h
-    HINTS ${dol}{OPENRTM_ROOT}/include ${dol}ENV{OPENRTM_ROOT}/include
-    ${dol}{PC_OPENRTM_INCLUDE_DIRS})
+    HINTS ${dol}{OPENRTM_ROOT}/include ${dol}{OPENRTM_ROOT} ${dol}ENV{OPENRTM_ROOT}/include ${dol}{PC_OPENRTM_INCLUDE_DIRS})
+
 find_path(COIL_INCLUDE_DIR coil/config_coil.h
-    HINTS ${dol}{OPENRTM_ROOT}/include ${dol}ENV{OPENRTM_ROOT}/include
-    ${dol}{PC_COIL_INCLUDE_DIRS})
+    HINTS ${dol}{OPENRTM_ROOT}/include ${dol}ENV{OPENRTM_ROOT}/include ${dol}{PC_COIL_INCLUDE_DIRS})
+
+find_path(OMNIORB4_INCLUDE_DIR omniORB4/omniORB.h
+    HITS ${dol}{OMNI_ROOT}/include ${dol}{PC_OMNIORB4_INCLUDE_DIRS})
+
 find_library(OPENRTM_LIBRARY RTC
     HINTS ${dol}{OPENRTM_ROOT}/lib ${dol}ENV{OPENRTM_ROOT}/lib
     ${dol}{PC_OPENRTM_LIBRARY_DIRS})
 find_library(COIL_LIBRARY coil
     HINTS ${dol}{OPENRTM_ROOT}/lib ${dol}ENV{OPENRTM_ROOT}/lib
     ${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(OMNIDYNAMIC4_LIBRARY omniDynamic4
+    HINTS ${dol}{PC_OMNIDYNAMIC4_LIBRARY_DIRS})
+find_library(UUID_LIBRARY uuid
+    HINTS ${dol}{PC_UUID_LIBRARY_DIRS})
 
-set(OPENRTM_CFLAGS ${dol}{PC_OPENRTM_CFLAGS_OTHER} ${dol}{PC_COIL_CFLAGS_OTHER})
+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})
-set(OPENRTM_LIBRARIES ${dol}{OPENRTM_LIBRARY} ${dol}{COIL_LIBRARY} uuid dl pthread
-    omniORB4 omnithread omniDynamic4)
+    ${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)
 
 file(STRINGS ${dol}{OPENRTM_INCLUDE_DIR}/rtm/version.h OPENRTM_VERSION
     NEWLINE_CONSUME)