i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-10-04 17:17:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed #525

Browse Source
This commit is contained in:
matlabbe
2020-04-03 17:28:23 -04:00
parent 034adb9f1f
commit 9c62a11316
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+12 -5
View File
@@ -293,16 +293,23 @@ IF(WITH_QT)
SET(PCL_LIBRARIES "${PCL_LIBRARIES};vtkGUISupportQt") SET(PCL_LIBRARIES "${PCL_LIBRARIES};vtkGUISupportQt")
SET(ADD_VTK_GUI_SUPPORT_QT_TO_CONF TRUE) SET(ADD_VTK_GUI_SUPPORT_QT_TO_CONF TRUE)
ENDIF(value EQUAL -1) ENDIF(value EQUAL -1)
MESSAGE(STATUS "VTK_RENDERING_BACKEND=${VTK_RENDERING_BACKEND}") MESSAGE(STATUS "VTK_RENDERING_BACKEND=${VTK_RENDERING_BACKEND}")
IF(VTK_RENDERING_BACKEND STREQUAL "OpenGL2") IF(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
ADD_DEFINITIONS("-DVTK_OPENGL2") ADD_DEFINITIONS("-DVTK_OPENGL2")
# see issue #525
list(FIND PCL_LIBRARIES vtkRenderingVolumeOpenGL2 value)
IF(value EQUAL -1)
SET(PCL_LIBRARIES "${PCL_LIBRARIES};vtkRenderingVolumeOpenGL2")
ENDIF(value EQUAL -1)
ELSEIF(VTK_RENDERING_BACKEND STREQUAL "OpenGL") ELSEIF(VTK_RENDERING_BACKEND STREQUAL "OpenGL")
# PCL 1.9 not adding vtkRenderingVolumeOpenGL as dependency anymore, so add it for us # PCL 1.9 not adding vtkRenderingVolumeOpenGL as dependency anymore, so add it for us
list(FIND PCL_LIBRARIES vtkRenderingVolumeOpenGL value) list(FIND PCL_LIBRARIES vtkRenderingVolumeOpenGL value)
IF(value EQUAL -1) IF(value EQUAL -1)
SET(PCL_LIBRARIES "${PCL_LIBRARIES};vtkRenderingVolumeOpenGL") SET(PCL_LIBRARIES "${PCL_LIBRARIES};vtkRenderingVolumeOpenGL")
ENDIF(value EQUAL -1) ENDIF(value EQUAL -1)
ENDIF() ENDIF()
ENDIF() ENDIF()
ADD_DEFINITIONS(-DQT_NO_KEYWORDS) # To avoid conflicts with boost signals/foreach and Qt macros ADD_DEFINITIONS(-DQT_NO_KEYWORDS) # To avoid conflicts with boost signals/foreach and Qt macros
ENDIF(QT4_FOUND OR Qt5_FOUND) ENDIF(QT4_FOUND OR Qt5_FOUND)