[openrtm-commit:00901] r362 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder: generator/param generator/param/idl template/cmake

[openrtm ＠ openrtm.org]

Author: 
Date: 2012-10-29 00:14:27 +0900 (Mon, 29 Oct 2012)
New Revision: 362

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl
Log:
Modified CMakeFile

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java	2012-10-25 13:55:55 UTC (rev 361)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java	2012-10-28 15:14:27 UTC (rev 362)
@@ -753,7 +753,10 @@
 					if( targetIDL!=null) {
 						idlPathes.add(targetIDL.trim());
 						consumerIdlStrings.add(targetIDL);
-						consumerIdlParams.add(new IdlFileParam(targetIDL,this));
+						IdlFileParam target = new IdlFileParam(targetIDL,this);
+						target.setDataPort(true);
+						target.setTargetType(targetType);
+						consumerIdlParams.add(target);
 					}
 				}
 				break;

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java	2012-10-25 13:55:55 UTC (rev 361)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java	2012-10-28 15:14:27 UTC (rev 362)
@@ -19,6 +19,8 @@
 	private RtcParam parent;
 	private List<String> idlSearchPathes = new ArrayList<String>();
 	private List<String> includeIdlPathes = new ArrayList<String>();
+	private boolean isDataPort = false;
+	private String targetType;
 
 	public IdlFileParam() {
 	}
@@ -93,4 +95,19 @@
 		return result;
 	}
 
+	public boolean isDataPort() {
+		return isDataPort;
+	}
+
+	public void setDataPort(boolean isDataPort) {
+		this.isDataPort = isDataPort;
+	}
+
+	public String getTargetType() {
+		return targetType;
+	}
+	public void setTargetType(String targetType) {
+		this.targetType = targetType;
+	}
+
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl	2012-10-25 13:55:55 UTC (rev 361)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl	2012-10-28 15:14:27 UTC (rev 362)
@@ -30,6 +30,12 @@
     set(LIB_TYPE SHARED)
 endif(STATIC_LIBS)
 
+if (${dol}{CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+   ${sharp} Mac OS X specific code
+   SET(CMAKE_CXX_COMPILER "g++")
+endif (${dol}{CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+
+
 ${sharp} Set up installation directories
 set(BIN_INSTALL_DIR "components/bin")
 set(LIB_INSTALL_DIR "components/lib")