[openrtm-commit:03150] r3208 - in trunk/OpenRTM-aist: . examples

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-01-25 18:41:07 +0900 (Thu, 25 Jan 2018)
New Revision: 3208

Modified:
   trunk/OpenRTM-aist/CMakeLists.txt
   trunk/OpenRTM-aist/examples/CMakeLists.txt
Log:
[compat, bugfix, CMake] fixed bug.

Modified: trunk/OpenRTM-aist/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/CMakeLists.txt	2018-01-25 06:21:31 UTC (rev 3207)
+++ trunk/OpenRTM-aist/CMakeLists.txt	2018-01-25 09:41:07 UTC (rev 3208)
@@ -214,11 +214,12 @@
 		set(ORB_LINK_DIR ${ORB_ROOT}/lib)
 		set(ORB_LIBRARIES ACE TAO TAO_AnyTypeCode TAO_PortableServer TAO_Svc_Utils TAO_CosNaming TAO_IORTable TAO_CodecFactory TAO_PI TAO_Utils TAO_Strategies)
 		set(ORB_INCLUDE_DIR ${ORB_ROOT}/include)
+		SET(ORB_C_FLAGS_LIST ${ORB_C_FLAGS_LIST} -DACE_LACKS_CDR_ALIGNMENT)
 	elseif(MSVC)
 		set(ORB_LINK_DIR ${ORB_ROOT}/lib)
 		set(ORB_LIBRARIES optimized;ACE;optimized;TAO;optimized;TAO_AnyTypeCode;optimized;TAO_PortableServer;optimized;TAO_Svc_Utils;optimized;TAO_CosNaming;optimized;TAO_IORTable;optimized;TAO_CodecFactory;optimized;TAO_PI;optimized;TAO_Utils;optimized;TAO_Strategies;debug;ACEd;debug;TAOd;debug;TAO_AnyTypeCoded;debug;TAO_PortableServerd;debug;TAO_Svc_Utilsd;debug;TAO_CosNamingd;debug;TAO_IORTabled;debug;TAO_CodecFactoryd;debug;TAO_PId;debug;TAO_Utilsd;debug;TAO_Strategiesd;iphlpapi)
 		set(ORB_INCLUDE_DIR ${ORB_ROOT} ${ORB_ROOT}/TAO ${ORB_ROOT}/TAO/orbsvcs)
-		SET(ORB_C_FLAGS_LIST ${ORB_C_FLAGS_LIST} -D_WINSOCKAPI_ -DWITH_ACE)
+		SET(ORB_C_FLAGS_LIST ${ORB_C_FLAGS_LIST} -D_WINSOCKAPI_ -DWITH_ACE -DACE_LACKS_CDR_ALIGNMENT)
 	endif()
 	
 	ADD_DEFINITIONS(${ORB_C_FLAGS_LIST})

Modified: trunk/OpenRTM-aist/examples/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/CMakeLists.txt	2018-01-25 06:21:31 UTC (rev 3207)
+++ trunk/OpenRTM-aist/examples/CMakeLists.txt	2018-01-25 09:41:07 UTC (rev 3208)
@@ -1,6 +1,6 @@
 add_subdirectory(SimpleIO)
 add_subdirectory(SeqIO)
-add_subdirectory(AutoTest)
+#add_subdirectory(AutoTest)
 #add_subdirectory(HelloWorld)
 add_subdirectory(ExtTrigger)
 add_subdirectory(SimpleService)