minor changes...

git-svn-id: http://rtabmap.googlecode.com/svn/branches/0.3/rtabmap@57 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2011-06-05 21:10:49 +00:00
parent 6adde9b286
commit 6fccc56e7a
7 changed files with 101 additions and 36 deletions

View File

@@ -11,7 +11,7 @@
SET(UTILITE_VERSION_REQUIRED 0.2.11)
SET (UTILITE_POSSIBLE_ROOT_DIRS)
SET (UTILITE_ROOT)
# Add ROS UtiLite directory if ROS is installed
FIND_PROGRAM(ROSPACK_EXEC NAME rospack PATHS)
@@ -24,14 +24,16 @@ IF(ROSPACK_EXEC)
)
IF(UTILITE_ROS_PATH)
MESSAGE(STATUS "Found UtiLite ROS pkg : ${UTILITE_ROS_PATH}")
SET(UTILITE_POSSIBLE_ROOT_DIRS
SET(UTILITE_ROOT
${UTILITE_ROS_PATH}/utilite
${UTILITE_POSSIBLE_ROOT_DIRS}
${UTILITE_ROOT}
)
ENDIF(UTILITE_ROS_PATH)
ENDIF(ROSPACK_EXEC)
FIND_PROGRAM(URESOURCEGENERATOR_EXEC NAME uresourcegenerator PATHS ${UTILITE_POSSIBLE_ROOT_DIRS})
MESSAGE(STATUS ${UTILITE_POSSIBLE_ROOT_DIRS})
FIND_PROGRAM(URESOURCEGENERATOR_EXEC NAME uresourcegenerator PATHS ${UTILITE_ROOT}/bin)
IF(URESOURCEGENERATOR_EXEC)
EXECUTE_PROCESS(COMMAND ${URESOURCEGENERATOR_EXEC} -v
OUTPUT_VARIABLE UTILITE_VERSION
@@ -56,11 +58,11 @@ IF(URESOURCEGENERATOR_EXEC)
ELSE()
FIND_PATH(UTILITE_INCLUDE_DIR
utilite/UEventsManager.h
PATHS ${UTILITE_POSSIBLE_ROOT_DIRS})
PATHS ${UTILITE_ROOT}/include)
FIND_LIBRARY(UTILITE_LIBRARY
NAMES utilite
PATHS ${UTILITE_POSSIBLE_ROOT_DIRS})
PATHS ${UTILITE_ROOT}/lib)
ENDIF()
IF (UTILITE_INCLUDE_DIR AND UTILITE_LIBRARY)
@@ -73,9 +75,6 @@ IF (UTILITE_FOUND)
IF (NOT UtiLite_FIND_QUIETLY)
MESSAGE(STATUS "Found UtiLite ${UTILITE_VERSION}")
ENDIF (NOT UtiLite_FIND_QUIETLY)
IF (NOT URESOURCEGENERATOR_EXEC)
MESSAGE(STATUS "uresourcegenerator was not found")
ENDIF (NOT URESOURCEGENERATOR_EXEC)
ELSE ()
# fatal error if UTILITE is required but not found
IF (UtiLite_FIND_REQUIRED)