[openrtm-commit:00150] r2161 - trunk/OpenRTM-aist/utils/cmake

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2011-06-03 20:30:37 +0900 (Fri, 03 Jun 2011)
New Revision: 2161

Modified:
   trunk/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake
   trunk/OpenRTM-aist/utils/cmake/Makefile.am
Log:
Include options and other options are seperated in OpenRTMConfig.cmake
rtm_config.cmake include path changed from etc to cmake in Win32.


Modified: trunk/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake
===================================================================
--- trunk/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake	2011-06-03 10:56:20 UTC (rev 2160)
+++ trunk/OpenRTM-aist/utils/cmake/FindOpenRTM.cmake	2011-06-03 11:30:37 UTC (rev 2161)
@@ -3,6 +3,8 @@
 # @file FindOpenRTM.cmake
 # @brief Find script for cmake
 #
+# $Id$
+#
 # omniORB variables
 # - OMNIORB_DIR:
 # - OMNIORB_CFLAGS: cflags
@@ -131,7 +133,7 @@
 #------------------------------------------------------------
 if(WIN32)
   set(WIN32_RTM "10")
-  find_file(rtm_conf "rtm_config.cmake" PATHS "$ENV{RTM_ROOT}/etc")
+  find_file(rtm_conf "rtm_config.cmake" PATHS "$ENV{RTM_ROOT}/cmake")
   if(rtm_conf)
     set(WIN32_RTM "11")
     set(RTM_CONFIG_CMAKE "${rtm_conf}")
@@ -377,4 +379,4 @@
 message(STATUS "  OPENRTM_IDLC=${OPENRTM_IDLC}")
 message(STATUS "  OPENRTM_IDLFLAGS=${OPENRTM_IDLFLAGS}")
 message(STATUS "  OPENRTM_IDL_WRAPPER=${OPENRTM_IDL_WRAPPER}")
-message(STATUS "  OPENRTM_IDL_WRAPPER_FLAGS=${OPENRTM_IDL_WRAPPER_FLAGS}")
\ No newline at end of file
+message(STATUS "  OPENRTM_IDL_WRAPPER_FLAGS=${OPENRTM_IDL_WRAPPER_FLAGS}")

Modified: trunk/OpenRTM-aist/utils/cmake/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/utils/cmake/Makefile.am	2011-06-03 10:56:20 UTC (rev 2160)
+++ trunk/OpenRTM-aist/utils/cmake/Makefile.am	2011-06-03 11:30:37 UTC (rev 2161)
@@ -77,13 +77,13 @@
 cmake_DATA = OpenRTMConfig.cmake FindOpenRTM.cmake
 
 # basic compiler/linker options
-OPENRTM_CFLAGS=${CXXFLAGS}
+OPENRTM_CFLAGS=`echo "${CXXFLAGS}" | sed -e 's/\-I[^ ]*//g'`
 OPENRTM_INCLUDE_DIRS=        \
 	-I${prefix}/include  \
 	-I${coil_includedir} \
 	-I${rtm_includedir}  \
 	-I${rtm_includedir}/rtm/idl
-OPENRTM_LDFLAGS_=${LDFLAGS}
+OPENRTM_LDFLAGS_=`echo "${LDFLAGS}" | sed -e 's/\-L[^ ]*//g'`
 OPENRTM_LIBRARY_DIRS=-L${prefix}/lib
 OPENRTM_LIBRARIES_=${LIBS} -lRTC -lcoil
 
@@ -152,7 +152,7 @@
 	echo "" >> $@
 	echo "" >> $@
 	echo "# Basic compiler/linker options" >> $@
-	echo "set(OPENRTM_CFLAGS ${CXXFLAGS})" >> $@
+	echo "set(OPENRTM_CFLAGS ${OPENRTM_CFLAGS})" >> $@
 	echo "set(OPENRTM_INCLUDE_DIRS ${OPENRTM_INCLUDE_DIRS})" >> $@
 	echo "set(OPENRTM_LDFLAGS ${OPENRTM_LDFLAGS_})" >> $@
 	echo "set(OPENRTM_LIBRARY_DIRS ${OPENRTM_LIBRARY_DIRS})" >> $@