[openrtm-commit:03132] r3200 - trunk/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-01-24 12:04:18 +0900 (Wed, 24 Jan 2018)
New Revision: 3200

Modified:
   trunk/OpenRTM-aist/CMakeLists.txt
Log:
[compat,CMake] refs #3265

Modified: trunk/OpenRTM-aist/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/CMakeLists.txt	2018-01-24 01:33:23 UTC (rev 3199)
+++ trunk/OpenRTM-aist/CMakeLists.txt	2018-01-24 03:04:18 UTC (rev 3200)
@@ -31,7 +31,9 @@
 	endif()
 endif()
 
+set(SSL_ENABLE ${SSL_ENABLE} CACHE BOOL "set SSL_ENABLE")
 
+
 if(CORBA MATCHES "ORBexpress")
 	if(NOT IDL_COMPILE_COMMAND)
 		set(IDL_COMPILE_COMMAND ${ORB_ROOT}/host/x86_linux_2.6/bin/idl2cpp)
@@ -166,6 +168,9 @@
 		endif()
 		set(ORB_LINK_DIR ${ORB_ROOT}/lib)
 		set(ORB_LIBRARIES omniDynamic4 omniORB4 omnithread)
+		if(SSL_ENABLE)
+			set(ORBSSL_LIBRARIES omnisslTP4)
+		endif(SSL_ENABLE)
 	elseif(MSVC)
 		if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "ARM")
 			SET (ORB_C_FLAGS_LIST
@@ -181,6 +186,9 @@
 			set(ORB_LINK_DIR ${ORB_ROOT}/lib/x86_win32)
 		endif()
 		set(ORB_LIBRARIES optimized;omniDynamic${OMNI_VERSION}${OMNI_MINOR}_rt;optimized;omniORB${OMNI_VERSION}${OMNI_MINOR}_rt;omnithread${OMNITHREAD_VERSION}_rt;debug;omniDynamic${OMNI_VERSION}${OMNI_MINOR}_rtd;debug;omniORB${OMNI_VERSION}${OMNI_MINOR}_rtd;debug;omnithread${OMNITHREAD_VERSION}_rtd)
+		if(SSL_ENABLE)
+			set(ORBSSL_LIBRARIES optimized;omnisslTP${OMNI_VERSION}${OMNI_MINOR}_rt;debug;omnisslTP${OMNI_VERSION}${OMNI_MINOR}_rtd)
+		endif(SSL_ENABLE)
 	endif(VXWORKS)
 
 	set(ORB_INCLUDE_DIR ${ORB_ROOT}/include)