i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-02 01:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

only search for QVTK if VTK5 is found (not for VTK6)

Browse Source 
git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1616 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2014-07-26 05:23:24 +00:00
parent 28787d583b
commit 8fe1b1d589
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -135,7 +135,9 @@ ENDIF(APPLE)
FIND_PACKAGE(OpenCV REQUIRED core highgui flann features2d calib3d imgproc nonfree gpu) FIND_PACKAGE(OpenCV REQUIRED core highgui flann features2d calib3d imgproc nonfree gpu)
FIND_PACKAGE(PCL 1.7 REQUIRED) FIND_PACKAGE(PCL 1.7 REQUIRED)
FIND_PACKAGE(VTK REQUIRED) FIND_PACKAGE(VTK REQUIRED)
find_package(QVTK REQUIRED) IF("${VTK_MAJOR_VERSION}" EQUAL 5)
FIND_PACKAGE(QVTK REQUIRED) # only for VTK 5
ENDIF("${VTK_MAJOR_VERSION}" EQUAL 5)
FIND_PACKAGE(ZLIB REQUIRED) FIND_PACKAGE(ZLIB REQUIRED)
FIND_PACKAGE(Freenect) FIND_PACKAGE(Freenect)
FIND_PACKAGE(OpenNI2) FIND_PACKAGE(OpenNI2)

7
guilib/src/CMakeLists.txt
View File

@@ -83,7 +83,6 @@ SET(INCLUDE_DIRS
${OpenCV_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} # for qt ui generated in binary dir ${CMAKE_CURRENT_BINARY_DIR} # for qt ui generated in binary dir
${PCL_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS}
${QVTK_INCLUDE_DIR}
) )
INCLUDE(${QT_USE_FILE}) INCLUDE(${QT_USE_FILE})
@@ -92,9 +91,13 @@ SET(LIBRARIES
${QT_LIBRARIES} ${QT_LIBRARIES}
${OpenCV_LIBS} ${OpenCV_LIBS}
${PCL_LIBRARIES} ${PCL_LIBRARIES}
${QVTK_LIBRARY}
) )
IF(VTK_USE_QVTK)
SET(INCLUDE_DIRS ${INCLUDE_DIRS} ${QVTK_INCLUDE_DIR})
SET(LIBRARIES ${LIBRARIES} ${QVTK_LIBRARY})
ENDIF(VTK_USE_QVTK)
#include files #include files
INCLUDE_DIRECTORIES(${INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${INCLUDE_DIRS})