i/rtabmap_ros
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap_ros.git synced 2026-10-04 00:37:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated FindUtilite.cmake to find utilite with rospack

Browse Source 
git-svn-id: http://rtabmap.googlecode.com/svn/branches/0.3/rtabmap@55 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2011-06-05 15:44:22 +00:00
parent 2d73090f3a
commit 6adde9b286
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -152,7 +152,7 @@ INCLUDE_DIRECTORIES(corelib/include/)
IF(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND) IF(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND)
ADD_SUBDIRECTORY( guilib ) ADD_SUBDIRECTORY( guilib )
INCLUDE_DIRECTORIES(guilib/include/) INCLUDE_DIRECTORIES(guilib/include/)
ADD_SUBDIRECTORY( ${PROJECT_PREFIX} ) ADD_SUBDIRECTORY( app )
ELSE() ELSE()
MESSAGE(STATUS "[WARNING] Qt4 not found, the GUI lib and the stand-alone application will not be compiled...") MESSAGE(STATUS "[WARNING] Qt4 not found, the GUI lib and the stand-alone application will not be compiled...")
ENDIF() ENDIF()
cmake_modules/FindUtiLite.cmake
+26 -3
View File
@@ -11,7 +11,27 @@
SET(UTILITE_VERSION_REQUIRED 0.2.11) SET(UTILITE_VERSION_REQUIRED 0.2.11)
FIND_PROGRAM(URESOURCEGENERATOR_EXEC NAME uresourcegenerator PATHS) SET (UTILITE_POSSIBLE_ROOT_DIRS)
# Add ROS UtiLite directory if ROS is installed
FIND_PROGRAM(ROSPACK_EXEC NAME rospack PATHS)
IF(ROSPACK_EXEC)
MESSAGE(STATUS "Found rospack executable : ${ROSPACK_EXEC}")
EXECUTE_PROCESS(COMMAND ${ROSPACK_EXEC} find utilite
OUTPUT_VARIABLE UTILITE_ROS_PATH
OUTPUT_STRIP_TRAILING_WHITESPACE
WORKING_DIRECTORY "./"
)
IF(UTILITE_ROS_PATH)
MESSAGE(STATUS "Found UtiLite ROS pkg : ${UTILITE_ROS_PATH}")
SET(UTILITE_POSSIBLE_ROOT_DIRS
${UTILITE_ROS_PATH}/utilite
${UTILITE_POSSIBLE_ROOT_DIRS}
)
ENDIF(UTILITE_ROS_PATH)
ENDIF(ROSPACK_EXEC)
FIND_PROGRAM(URESOURCEGENERATOR_EXEC NAME uresourcegenerator PATHS ${UTILITE_POSSIBLE_ROOT_DIRS})
IF(URESOURCEGENERATOR_EXEC) IF(URESOURCEGENERATOR_EXEC)
EXECUTE_PROCESS(COMMAND ${URESOURCEGENERATOR_EXEC} -v EXECUTE_PROCESS(COMMAND ${URESOURCEGENERATOR_EXEC} -v
OUTPUT_VARIABLE UTILITE_VERSION OUTPUT_VARIABLE UTILITE_VERSION
@@ -35,9 +55,12 @@ IF(URESOURCEGENERATOR_EXEC)
ELSE() ELSE()
FIND_PATH(UTILITE_INCLUDE_DIR FIND_PATH(UTILITE_INCLUDE_DIR
utilite/UEventsManager.h) utilite/UEventsManager.h
PATHS ${UTILITE_POSSIBLE_ROOT_DIRS})
FIND_LIBRARY(UTILITE_LIBRARY NAMES utilite) FIND_LIBRARY(UTILITE_LIBRARY
NAMES utilite
PATHS ${UTILITE_POSSIBLE_ROOT_DIRS})
ENDIF() ENDIF()
IF (UTILITE_INCLUDE_DIR AND UTILITE_LIBRARY) IF (UTILITE_INCLUDE_DIR AND UTILITE_LIBRARY)