From 8fe1b1d5898f8ac929334bf9a29c04f6b06817c5 Mon Sep 17 00:00:00 2001
From: matlabbe <matlabbe@f169173b-cf89-36c8-b27e-44dbe73f0c83>
Date: Sat, 26 Jul 2014 05:23:24 +0000
Subject: [PATCH] only search for QVTK if VTK5 is found (not for VTK6)

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1616 f169173b-cf89-36c8-b27e-44dbe73f0c83
---
 CMakeLists.txt            | 4 +++-
 guilib/src/CMakeLists.txt | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7a0a79b..cab7e0fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,7 +135,9 @@ 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)
+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(Freenect)
 FIND_PACKAGE(OpenNI2)
diff --git a/guilib/src/CMakeLists.txt b/guilib/src/CMakeLists.txt
index 115a7b79..6a275531 100644
--- a/guilib/src/CMakeLists.txt
+++ b/guilib/src/CMakeLists.txt
@@ -83,7 +83,6 @@ 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})
@@ -92,9 +91,13 @@ SET(LIBRARIES
     ${QT_LIBRARIES} 
 	${OpenCV_LIBS} 
 	${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_DIRECTORIES(${INCLUDE_DIRS})