[openrtm-commit:03361] r3434 - in trunk/OpenRTM-aist: . src/ext/ec/rtpreempt

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-11-07 09:26:53 +0900 (Wed, 07 Nov 2018)
New Revision: 3434

Modified:
   trunk/OpenRTM-aist/CMakeLists.txt
   trunk/OpenRTM-aist/src/ext/ec/rtpreempt/CMakeLists.txt
Log:
[cmpat, cmake]

Modified: trunk/OpenRTM-aist/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/CMakeLists.txt	2018-11-06 08:10:42 UTC (rev 3433)
+++ trunk/OpenRTM-aist/CMakeLists.txt	2018-11-07 00:26:53 UTC (rev 3434)
@@ -21,7 +21,7 @@
 if(NOT ORB_ROOT)
 	if(CORBA STREQUAL "omniORB")
 		if(UNIX)
-			set(ORB_ROOT "/usr" CACHE PATH "set ORB_ROOT")
+			set(ORB_ROOT "" CACHE PATH "set ORB_ROOT")
 		else(UNIX)
 			message(FATAL_ERROR "Please set ORB_ROOT.")
 		endif(UNIX)
@@ -139,13 +139,17 @@
 	SET(IDLCOMMAND_FLAGS -m -a -ex -fhh -fxcc -fc_c -fs -q -dOE_IDL -I${ORB_ROOT}/idl )
 elseif(CORBA STREQUAL "omniORB")
 	if(NOT IDL_COMPILE_COMMAND)
-		if(VXWORKS)
-			set(IDL_COMPILE_COMMAND ${ORB_ROOT}/build/bin/omniidl)
-		elseif(UNIX)
-			set(IDL_COMPILE_COMMAND ${ORB_ROOT}/bin/omniidl)
-		elseif(MSVC)
-			set(IDL_COMPILE_COMMAND ${ORB_ROOT}/bin/x86_win32/omniidl)
-		endif(VXWORKS)
+		if(test${ORB_ROOT} STREQUAL "test")
+			set(IDL_COMPILE_COMMAND omniidl)
+		else()
+			if(VXWORKS)
+				set(IDL_COMPILE_COMMAND ${ORB_ROOT}/build/bin/omniidl)
+			elseif(UNIX)
+				set(IDL_COMPILE_COMMAND ${ORB_ROOT}/bin/omniidl)
+			elseif(MSVC)
+				set(IDL_COMPILE_COMMAND ${ORB_ROOT}/bin/x86_win32/omniidl)
+			endif(VXWORKS)
+		endif()
 	endif()
 	SET(IDLCOMMAND_FLAGS -bcxx -Wba -nf -Wbshortcut)
 	#SET(IDLCOMMAND_FLAGS -bcxx -Wba -nf)
@@ -157,13 +161,17 @@
 	string(REGEX REPLACE "([0-9])([0-9])$" "\\2" OMNI_VERSION2 ${OMNI_VERSION})
 elseif(CORBA STREQUAL "TAO")
 	if(NOT IDL_COMPILE_COMMAND)
-		if(VXWORKS)
-			message(FATAL_ERROR "Please set IDL_COMPILE_COMMAND.")
-		elseif(UNIX)
-			set(IDL_COMPILE_COMMAND ${ORB_ROOT}/bin/tao_idl)
-		elseif(MSVC)
-			set(IDL_COMPILE_COMMAND ${ORB_ROOT}/bin/tao_idl)
-		endif(VXWORKS)
+		if(test${ORB_ROOT} STREQUAL "test")
+			set(IDL_COMPILE_COMMAND tao_idl)
+		else()
+			if(VXWORKS)
+				message(FATAL_ERROR "Please set IDL_COMPILE_COMMAND.")
+			elseif(UNIX)
+				set(IDL_COMPILE_COMMAND ${ORB_ROOT}/bin/tao_idl)
+			elseif(MSVC)
+				set(IDL_COMPILE_COMMAND ${ORB_ROOT}/bin/tao_idl)
+			endif(VXWORKS)
+		endif()
 	endif()
 	if(UNIX)
 		SET(IDLCOMMAND_FLAGS -as -DTAO_IDL -I${ORB_ROOT}/include)

Modified: trunk/OpenRTM-aist/src/ext/ec/rtpreempt/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/rtpreempt/CMakeLists.txt	2018-11-06 08:10:42 UTC (rev 3433)
+++ trunk/OpenRTM-aist/src/ext/ec/rtpreempt/CMakeLists.txt	2018-11-07 00:26:53 UTC (rev 3434)
@@ -12,6 +12,7 @@
 include_directories(
 		${RTM_INCLUDE_DIR}
 		${ORB_INCLUDE_DIR}
+		${CMAKE_CURRENT_SOURCE_DIR}
 		)
 
 ADD_DEFINITIONS(${ORB_C_FLAGS_LIST})