diff --git a/CMakeLists.txt b/CMakeLists.txt index 6dcb9702..d7a0a79b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,6 +135,7 @@ ENDIF(APPLE) FIND_PACKAGE(OpenCV REQUIRED core highgui flann features2d calib3d imgproc nonfree gpu) FIND_PACKAGE(PCL 1.7 REQUIRED) FIND_PACKAGE(VTK REQUIRED) +find_package(QVTK REQUIRED) FIND_PACKAGE(ZLIB REQUIRED) FIND_PACKAGE(Freenect) FIND_PACKAGE(OpenNI2) diff --git a/cmake_modules/FindQVTK.cmake b/cmake_modules/FindQVTK.cmake new file mode 100644 index 00000000..18ae5767 --- /dev/null +++ b/cmake_modules/FindQVTK.cmake @@ -0,0 +1,23 @@ +############################################################################### +# Find QVTK +# +# This sets the following variables: +# QVTK_FOUND - True if QVTK was found. +# QVTK_INCLUDE_DIR - Directory containing the QVTK include files. +# QVTK_LIBRARY - QVTK library. +# if QVTK_FOUND then QVTK_INCLUDE_DIR is appended to VTK_INCLUDE_DIRS and +# QVTK_LIBRARY is appended to QVTK_LIBRARY_DIR + +find_library (QVTK_LIBRARY QVTK HINTS ${VTK_DIR} ${VTK_DIR}/bin) +find_path (QVTK_INCLUDE_DIR QVTKWidget.h HINT ${VTK_INCLUDE_DIRS}) +find_package_handle_standard_args(QVTK DEFAULT_MSG + QVTK_LIBRARY QVTK_INCLUDE_DIR) + +if(NOT QVTK_FOUND) + set (VTK_USE_QVTK OFF) +else(NOT QVTK_FOUND) + get_filename_component (QVTK_LIBRARY_DIR ${QVTK_LIBRARY} PATH) + set (VTK_LIBRARY_DIRS ${VTK_LIBRARY_DIRS} ${QVTK_LIBRARY_DIR}) + set (VTK_INCLUDE_DIRS ${VTK_INCLUDE_DIRS} ${QVTK_INCLUDE_DIR}) + set (VTK_USE_QVTK ON) +endif(NOT QVTK_FOUND) diff --git a/guilib/src/CMakeLists.txt b/guilib/src/CMakeLists.txt index b5a6c081..115a7b79 100644 --- a/guilib/src/CMakeLists.txt +++ b/guilib/src/CMakeLists.txt @@ -83,16 +83,16 @@ SET(INCLUDE_DIRS ${OpenCV_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} # for qt ui generated in binary dir ${PCL_INCLUDE_DIRS} + ${QVTK_INCLUDE_DIR} ) INCLUDE(${QT_USE_FILE}) -INCLUDE(${VTK_USE_FILE}) - SET(LIBRARIES ${QT_LIBRARIES} ${OpenCV_LIBS} ${PCL_LIBRARIES} + ${QVTK_LIBRARY} ) #include files