From 4d6cfbba203d7097ff0f17ff04fc574f3bbd214a Mon Sep 17 00:00:00 2001 From: matlabbe Date: Thu, 29 Sep 2016 12:40:51 -0400 Subject: [PATCH] RTABMapConfig.cmake: added find VTK if vtkGUISupportQt target is required --- CMakeLists.txt | 5 ++++- RTABMapConfig.cmake.in | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 377dfc95..4f3092b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -412,8 +412,11 @@ ELSE() SET(CONF_DEPENDENCIES ${CONF_DEPENDENCIES} ${OCTOMAP_LIBRARIES}) ENDIF() IF(ADD_VTK_GUI_SUPPORT_QT_TO_CONF) + SET(CONF_VTK_QT true) SET(CONF_DEPENDENCIES ${CONF_DEPENDENCIES} vtkGUISupportQt) -ENDIF(ADD_VTK_GUI_SUPPORT_QT_TO_CONF) +ELSE() + SET(CONF_VTK_QT false) +ENDIF() IF(NOT (OpenCV_FOUND AND OpenCV_VERSION_MAJOR EQUAL 3)) SET(OPENCV3 "//") ENDIF(NOT (OpenCV_FOUND AND OpenCV_VERSION_MAJOR EQUAL 3)) diff --git a/RTABMapConfig.cmake.in b/RTABMapConfig.cmake.in index cfff0d81..2660a6d5 100644 --- a/RTABMapConfig.cmake.in +++ b/RTABMapConfig.cmake.in @@ -62,6 +62,9 @@ if(@CONF_WITH_GUI@) endif(@CONF_WITH_GUI@) # Dependencies +if(@CONF_VTK_QT@) + find_package(VTK COMPONENTS vtkGUISupportQt NO_MODULE) # to define vtkGUISupportQt target +endif(@CONF_VTK_QT@) set(RTABMap_LIBRARIES ${RTABMap_LIBRARIES} @CONF_DEPENDENCIES@) #backward compatibilities