Skip to content

Commit a741ada

Browse files
authored
Merge pull request #33 from dfki-ric/vizkit3d-qt5-but-no-maps-base
Check for all -viz packages used by the gui
2 parents 49e82f4 + 9a3ed49 commit a741ada

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/gui/CMakeLists.txt

+8-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ pkg_check_modules(vizkit3d-qt5 vizkit3d-qt5)
77
pkg_check_modules(vizkit3d_debug_drawings vizkit3d_debug_drawings)
88
pkg_check_modules(vizkit3d_debug_drawings-qt5 vizkit3d_debug_drawings-qt5)
99

10+
pkg_check_modules(maps-viz maps-viz)
11+
pkg_check_modules(maps-viz-qt5 maps-viz-qt5)
12+
13+
pkg_check_modules(base-viz base-viz)
14+
pkg_check_modules(base-viz-qt5 base-viz-qt5)
15+
1016
find_package(PCL 1.7 REQUIRED COMPONENTS common io)
1117
IF("${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}" VERSION_LESS 1.14)
1218
SET(PCL_VERSION_SUFFIX "-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
@@ -22,7 +28,7 @@ if(ENABLE_DEBUG_DRAWINGS AND vizkit3d_debug_drawings-commands_FOUND)
2228
endif()
2329
endif()
2430

25-
if(ROCK_QT_VERSION_4 AND vizkit3d_FOUND)
31+
if(ROCK_QT_VERSION_4 AND vizkit3d_FOUND AND maps-viz_FOUND AND base-viz_FOUND)
2632
rock_library(ugv_nav4d_gui
2733
SOURCES
2834
PlannerGui.cpp
@@ -65,7 +71,7 @@ else(ROCK_QT_VERSION_4 AND vizkit3d_FOUND)
6571
message(STATUS "Gui using Qt4: disabled")
6672
endif(ROCK_QT_VERSION_4 AND vizkit3d_FOUND)
6773

68-
if(ROCK_QT_VERSION_5 AND vizkit3d-qt5_FOUND)
74+
if(ROCK_QT_VERSION_5 AND vizkit3d-qt5_FOUND AND maps-viz-qt5_FOUND AND base-viz-qt5_FOUND)
6975
rock_library(ugv_nav4d_gui-qt5
7076
SOURCES
7177
PlannerGui.cpp

0 commit comments

Comments
 (0)