[openrtm-commit:00471] r2240 - trunk/OpenRTM-aist/utils/cmake

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-11-15 17:32:55 +0900 (Tue, 15 Nov 2011)
New Revision: 2240

Modified:
   trunk/OpenRTM-aist/utils/cmake/Makefile.am
Log:
Fixed OpenRMTConfig.cmake. 

Modified: trunk/OpenRTM-aist/utils/cmake/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/utils/cmake/Makefile.am	2011-10-25 13:34:57 UTC (rev 2239)
+++ trunk/OpenRTM-aist/utils/cmake/Makefile.am	2011-11-15 08:32:55 UTC (rev 2240)
@@ -92,6 +92,7 @@
 OPENRTM_INCLUDE_DIR=${rtm_includedir}
 OPENRTM_LIB_DIR=${rtm_libdir}
 OPENRTM_DATA_DIR=${rtm_datadir}
+OPENRTM_DIR=${prefix}
 
 # OpenRTM-aist version
 OPENRTM_VERSION=${RTM_VERSION}
@@ -158,6 +159,7 @@
 	echo "set(OPENRTM_LIBRARY_DIRS ${OPENRTM_LIBRARY_DIRS})" >> $@
 	echo "set(OPENRTM_LIBRARIES ${OPENRTM_LIBRARIES_})" >> $@
 	echo "set(OPENRTM_LIB_DIR ${OPENRTM_LIB_DIR})" >> $@
+	echo "set(OPENRTM_DIR ${OPENRTM_DIR})" >> $@
 	echo "" >> $@
 	echo "# OpenRTM-aist specific directory" >> $@
 	echo "set(COIL_INCLUDE_DIR ${COIL_INCLUDE_DIR})" >> $@
@@ -179,6 +181,18 @@
 	echo "set(OPENRTM_IDLC ${OPENRTM_IDLC})" >> $@
 	echo "set(OPENRTM_IDLFLAGS ${OPENRTM_IDLFLAGS})" >> $@
 	echo "" >> $@
+	echo "include(FindPkgConfig)" >> $@
+	echo "#" >> $@
+	echo "# Getting omniORB settings" >> $@
+	echo "#" >> $@
+	echo "pkg_check_modules(OMNIORB REQUIRED "omniORB4")" >> $@
+	echo "if(NOT OMNIORB_DIR)" >> $@
+	echo "  if(OMNIORB_FOUND)" >> $@
+	echo "    set(OMNIORB_DIR "${OMNIORB_PREFIX}")" >> $@
+	echo "  endif()" >> $@
+	echo "  set(OMNIORB_DIR "${OMNIORB_DIR}" CACHE PATH "omniORB root directory")" >> $@
+	echo "endif()" >> $@
+	echo "" >> $@
 	echo 'message(STATUS "OpenRTM-aist configuration done")' >> $@
 	echo "# end of OpenRTMConfig.cmake" >> $@