[openrtm-commit:03375] r3447 - in trunk/OpenRTM-aist/src/lib: coil rtm rtm/ext/rtmCamera rtm/ext/rtmManipulator

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-11-16 10:18:58 +0900 (Fri, 16 Nov 2018)
New Revision: 3447

Modified:
   trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt
   trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt
   trunk/OpenRTM-aist/src/lib/rtm/ext/rtmCamera/CMakeLists.txt
   trunk/OpenRTM-aist/src/lib/rtm/ext/rtmManipulator/CMakeLists.txt
Log:
[compat, cmake]

Modified: trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt	2018-11-16 01:08:45 UTC (rev 3446)
+++ trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt	2018-11-16 01:18:58 UTC (rev 3447)
@@ -128,11 +128,7 @@
 
 
 if(WIN32)
-	if(CMAKE_BUILD_TYPE MATCHES RELEASE)
-		set(DEF_FILE_NAME  ${COIL_PROJECT_NAME}.def)
-	else()
-		set(DEF_FILE_NAME  ${COIL_PROJECT_NAME}d.def)
-	endif()
+	set(DEF_FILE_NAME  ${COIL_PROJECT_NAME}.def)
 	add_library(${COIL_PROJECT_NAME}_static STATIC ${coil_srcs})
 	get_property(coil_static_location TARGET ${COIL_PROJECT_NAME}_static PROPERTY LOCATION)
 	add_custom_command(OUTPUT ${DEF_FILE_NAME}

Modified: trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt	2018-11-16 01:08:45 UTC (rev 3446)
+++ trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt	2018-11-16 01:18:58 UTC (rev 3447)
@@ -422,11 +422,7 @@
 	#	set(skel_files ${skel_files} ${SKEL_IDL_DIR}/${filename})
 	#ENDFOREACH()
 
-	if(CMAKE_BUILD_TYPE MATCHES RELEASE)
-		set(DEF_FILE_NAME  ${RTM_PROJECT_NAME}.def)
-	else()
-		set(DEF_FILE_NAME  ${RTM_PROJECT_NAME}d.def)
-	endif()
+	set(DEF_FILE_NAME  ${RTM_PROJECT_NAME}.def)
 	#ADD_DEFINITIONS(-DLIBRARY_EXPORTS)
 	#add_library(${RTM_PROJECT_NAME}_static STATIC ${rtm_srcs} ${ALL_IDL_SRCS_RTM})
 

Modified: trunk/OpenRTM-aist/src/lib/rtm/ext/rtmCamera/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ext/rtmCamera/CMakeLists.txt	2018-11-16 01:08:45 UTC (rev 3446)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/rtmCamera/CMakeLists.txt	2018-11-16 01:18:58 UTC (rev 3447)
@@ -89,11 +89,7 @@
 
 
 if(WIN32)
-	if(CMAKE_BUILD_TYPE MATCHES RELEASE)
-		set(DEF_FILE_NAME  ${target}.def)
-	else()
-		set(DEF_FILE_NAME  ${target}d.def)
-	endif()
+	set(DEF_FILE_NAME  ${target}.def)
 
 	add_library(${target}_static STATIC ${ALL_IDL_SRCS} )
 	add_dependencies(${target}_static ${RTCSKEL_PROJECT_NAME})

Modified: trunk/OpenRTM-aist/src/lib/rtm/ext/rtmManipulator/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ext/rtmManipulator/CMakeLists.txt	2018-11-16 01:08:45 UTC (rev 3446)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/rtmManipulator/CMakeLists.txt	2018-11-16 01:18:58 UTC (rev 3447)
@@ -92,11 +92,7 @@
 
 
 if(WIN32)
-	if(CMAKE_BUILD_TYPE MATCHES RELEASE)
-		set(DEF_FILE_NAME  ${target}.def)
-	else()
-		set(DEF_FILE_NAME  ${target}d.def)
-	endif()
+	set(DEF_FILE_NAME  ${target}.def)
 
 	add_library(${target}_static STATIC ${ALL_IDL_SRCS} )
 	add_dependencies(${target}_static ${RTCSKEL_PROJECT_NAME})