mirror of
https://github.com/introlab/rtabmap_ros.git
synced 2026-10-04 00:37:46 +08:00
merged attention branch to trunk
git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@657 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
#
|
||||
#
|
||||
|
||||
SET(UtiLite_VERSION_REQUIRED 0.2.14)
|
||||
SET(UtiLite_VERSION_REQUIRED 0.3.0)
|
||||
|
||||
SET(UtiLite_ROOT)
|
||||
|
||||
@@ -65,6 +65,12 @@ IF(URESOURCEGENERATOR_EXEC)
|
||||
FIND_LIBRARY(UtiLite_Audio
|
||||
NAMES utilite_audio
|
||||
PATH_SUFFIXES "../lib")
|
||||
FIND_LIBRARY(UtiLite_Cv
|
||||
NAMES utilite_cv
|
||||
PATH_SUFFIXES "../lib")
|
||||
FIND_LIBRARY(UtiLite_Cvqt
|
||||
NAMES utilite_cvqt
|
||||
PATH_SUFFIXES "../lib")
|
||||
|
||||
ELSE()
|
||||
FIND_PATH(UtiLite_INCLUDE_DIRS
|
||||
@@ -80,6 +86,12 @@ IF(URESOURCEGENERATOR_EXEC)
|
||||
FIND_LIBRARY(UtiLite_Audio
|
||||
NAMES utilite_audio
|
||||
PATHS ${UtiLite_ROOT}/lib)
|
||||
FIND_LIBRARY(UtiLite_Cv
|
||||
NAMES utilite_cv
|
||||
PATHS ${UtiLite_ROOT}/lib)
|
||||
FIND_LIBRARY(UtiLite_Cvqt
|
||||
NAMES utilite_cvqt
|
||||
PATHS ${UtiLite_ROOT}/lib)
|
||||
ENDIF()
|
||||
IF(UtiLite_LIBRARIES AND UtiLite_Qt)
|
||||
SET(UtiLite_LIBRARIES ${UtiLite_LIBRARIES} ${UtiLite_Qt})
|
||||
@@ -87,6 +99,12 @@ IF(URESOURCEGENERATOR_EXEC)
|
||||
IF(UtiLite_LIBRARIES AND UtiLite_Audio)
|
||||
SET(UtiLite_LIBRARIES ${UtiLite_LIBRARIES} ${UtiLite_Audio})
|
||||
ENDIF(UtiLite_LIBRARIES AND UtiLite_Audio)
|
||||
IF(UtiLite_LIBRARIES AND UtiLite_Cv)
|
||||
SET(UtiLite_LIBRARIES ${UtiLite_LIBRARIES} ${UtiLite_Cv})
|
||||
ENDIF(UtiLite_LIBRARIES AND UtiLite_Audio)
|
||||
IF(UtiLite_LIBRARIES AND UtiLite_Cvqt)
|
||||
SET(UtiLite_LIBRARIES ${UtiLite_LIBRARIES} ${UtiLite_Cvqt})
|
||||
ENDIF(UtiLite_LIBRARIES AND UtiLite_Audio)
|
||||
|
||||
IF (UtiLite_INCLUDE_DIRS AND UtiLite_LIBRARIES)
|
||||
SET(UtiLite_FOUND TRUE)
|
||||
|
||||
Reference in New Issue
Block a user