Explicitly find OpenCV package to link with libraries built in /usr/local if OpenCV is built from source

This commit is contained in:
matlabbe
2015-06-17 22:52:35 -04:00
parent 317f0ed53f
commit fa06d3050d
+4
View File
@@ -19,6 +19,8 @@ find_package(octomap_ros)
# find_package(Boost REQUIRED COMPONENTS system) # find_package(Boost REQUIRED COMPONENTS system)
find_package(RTABMap 0.9.0 REQUIRED) find_package(RTABMap 0.9.0 REQUIRED)
find_package(OpenCV REQUIRED)
#Qt stuff #Qt stuff
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED) FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
INCLUDE(${QT_USE_FILE}) INCLUDE(${QT_USE_FILE})
@@ -102,11 +104,13 @@ catkin_package(
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include
${RTABMap_INCLUDE_DIRS} ${RTABMap_INCLUDE_DIRS}
${OpenCV_INCLUDE_DIRS}
${catkin_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}
) )
# libraries # libraries
SET(Libraries SET(Libraries
${OpenCV_LIBRARIES}
${catkin_LIBRARIES} ${catkin_LIBRARIES}
${RTABMap_LIBRARIES} ${RTABMap_LIBRARIES}
) )