mirror of
https://github.com/introlab/rtabmap_ros.git
synced 2026-10-04 00:37:46 +08:00
Updated version to 0.3.1
Added search of OpenCV dir when OpenCV_DIR is not set (unix) Link UtiLite 0.2.12 git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@317 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
+1
-1
@@ -14,7 +14,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_modules")
|
|||||||
#######################
|
#######################
|
||||||
# VERSION
|
# VERSION
|
||||||
#######################
|
#######################
|
||||||
SET(PROJECT_VERSION "0.3.0")
|
SET(PROJECT_VERSION "0.3.1")
|
||||||
|
|
||||||
STRING(REGEX MATCHALL "[0-9]" PROJECT_VERSION_PARTS "${PROJECT_VERSION}")
|
STRING(REGEX MATCHALL "[0-9]" PROJECT_VERSION_PARTS "${PROJECT_VERSION}")
|
||||||
|
|
||||||
|
|||||||
@@ -66,6 +66,17 @@ if(NOT OpenCV_DIR)
|
|||||||
ENDIF(ROSPACK_EXEC)
|
ENDIF(ROSPACK_EXEC)
|
||||||
endif(NOT OpenCV_DIR)
|
endif(NOT OpenCV_DIR)
|
||||||
|
|
||||||
|
if(NOT OpenCV_DIR)
|
||||||
|
# typical root dirs of installations, exactly one of them is used
|
||||||
|
SET (OpenCV_POSSIBLE_ROOT_DIRS
|
||||||
|
/usr/local
|
||||||
|
/usr/opt
|
||||||
|
/usr
|
||||||
|
)
|
||||||
|
find_path(OpenCV_PATH "OpenCVConfig.cmake" HINTS ${OpenCV_POSSIBLE_ROOT_DIRS} PATH_SUFFIXES "share/opencv")
|
||||||
|
SET(OpenCV_DIR ${OpenCV_PATH})
|
||||||
|
endif(NOT OpenCV_DIR)
|
||||||
|
|
||||||
##====================================================
|
##====================================================
|
||||||
## Find OpenCV libraries
|
## Find OpenCV libraries
|
||||||
##----------------------------------------------------
|
##----------------------------------------------------
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|
||||||
SET(UTILITE_VERSION_REQUIRED 0.2.11)
|
SET(UTILITE_VERSION_REQUIRED 0.2.12)
|
||||||
|
|
||||||
SET(UTILITE_ROOT)
|
SET(UTILITE_ROOT)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user