Skip to content

Commit 4d71537

Browse files
committed
add vizkit3d and vizkit_debug_drawings check
1 parent b77bc1d commit 4d71537

File tree

2 files changed

+78
-62
lines changed

2 files changed

+78
-62
lines changed

src/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,15 @@ set(DEPS_PKGCONFIG_LIST
1212
traversability_generator3d
1313
trajectory_follower
1414
)
15-
15+
pkg_check_modules(vizkit3d_debug_drawings-commands vizkit3d_debug_drawings-commands)
16+
pkg_check_modules(vizkit3d_debug_drawings-qt5 vizkit3d_debug_drawings-qt5)
1617
if (ENABLE_DEBUG_DRAWINGS)
17-
list(APPEND DEPS_PKGCONFIG_LIST vizkit3d_debug_drawings-commands)
18+
if (vizkit3d_debug_drawings-commands)
19+
list(APPEND DEPS_PKGCONFIG_LIST vizkit3d_debug_drawings-commands)
20+
endif()
21+
if(vizkit3d_debug_drawings-qt5)
22+
list(APPEND DEPS_PKGCONFIG_LIST vizkit3d_debug_drawings-qt5)
23+
endif()
1824
endif()
1925

2026
rock_library(ugv_nav4d

src/gui/CMakeLists.txt

Lines changed: 70 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,87 @@
11
rock_find_qt4(OPTIONAL)
22
rock_find_qt5(OPTIONAL)
3+
pkg_check_modules(vizkit3d vizkit3d)
4+
pkg_check_modules(vizkit3d-qt5 vizkit3d-qt5)
35

46
find_package(PCL 1.7 REQUIRED COMPONENTS common io)
57
IF("${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}" VERSION_LESS 1.14)
68
SET(PCL_VERSION_SUFFIX "-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
79
ENDIF()
810

911
if(ROCK_QT_VERSION_4)
10-
rock_library(ugv_nav4d_gui
11-
SOURCES
12-
PlannerGui.cpp
13-
HEADERS
14-
PlannerGui.h
15-
MOC
16-
PlannerGui.h
17-
DEPS ugv_nav4d Qt4::QtCore
18-
DEPS_PKGCONFIG vizkit3d
19-
vizkit3d-viz
20-
maps-viz
21-
base-viz
22-
sbpl_spline_primitives-viz
23-
base-types
24-
trajectory_follower-viz
25-
pcl_common${PCL_VERSION_SUFFIX}
26-
pcl_io${PCL_VERSION_SUFFIX}
27-
)
12+
if (vizkit3d_FOUND)
13+
rock_library(ugv_nav4d_gui
14+
SOURCES
15+
PlannerGui.cpp
16+
HEADERS
17+
PlannerGui.h
18+
MOC
19+
PlannerGui.h
20+
DEPS ugv_nav4d Qt4::QtCore
21+
DEPS_PKGCONFIG vizkit3d
22+
vizkit3d-viz
23+
maps-viz
24+
base-viz
25+
sbpl_spline_primitives-viz
26+
base-types
27+
trajectory_follower-viz
28+
pcl_common${PCL_VERSION_SUFFIX}
29+
pcl_io${PCL_VERSION_SUFFIX}
30+
)
2831

29-
rock_executable(ugv_nav4d_bin
30-
SOURCES
31-
Main.cpp
32-
DEPS ugv_nav4d ugv_nav4d_gui
33-
)
32+
rock_executable(ugv_nav4d_bin
33+
SOURCES
34+
Main.cpp
35+
DEPS ugv_nav4d ugv_nav4d_gui
36+
)
3437

35-
rock_executable(ugv_nav4d_replay
36-
SOURCES
37-
ReplayDump.cpp
38-
DEPS ugv_nav4d ugv_nav4d_gui
39-
DEPS_PKGCONFIG vizkit3d maps-viz base-viz
40-
sbpl_spline_primitives-viz base-types trajectory_follower-viz
41-
)
38+
rock_executable(ugv_nav4d_replay
39+
SOURCES
40+
ReplayDump.cpp
41+
DEPS ugv_nav4d ugv_nav4d_gui
42+
DEPS_PKGCONFIG vizkit3d maps-viz base-viz
43+
sbpl_spline_primitives-viz base-types trajectory_follower-viz
44+
)
45+
else()
46+
message(STATUS "vizkit3d not found ... NOT building the ugv_nav4d_gui")
47+
endif()
4248
endif(ROCK_QT_VERSION_4)
4349

4450
if(ROCK_QT_VERSION_5)
45-
rock_library(ugv_nav4d_gui-qt5
46-
SOURCES
47-
PlannerGui.cpp
48-
HEADERS
49-
PlannerGui.h
50-
MOC5
51-
PlannerGui.h
52-
DEPS ugv_nav4d Qt5::Core
53-
DEPS_PKGCONFIG vizkit3d-qt5
54-
vizkit3d-viz-qt5
55-
maps-viz-qt5
56-
base-viz-qt5
57-
sbpl_spline_primitives-viz-qt5
58-
base-types
59-
trajectory_follower-viz-qt5
60-
pcl_common${PCL_VERSION_SUFFIX}
61-
pcl_io${PCL_VERSION_SUFFIX}
62-
)
51+
if (vizkit3d-qt5_FOUND)
52+
rock_library(ugv_nav4d_gui-qt5
53+
SOURCES
54+
PlannerGui.cpp
55+
HEADERS
56+
PlannerGui.h
57+
MOC5
58+
PlannerGui.h
59+
DEPS ugv_nav4d Qt5::Core
60+
DEPS_PKGCONFIG vizkit3d-qt5
61+
vizkit3d-viz-qt5
62+
maps-viz-qt5
63+
base-viz-qt5
64+
sbpl_spline_primitives-viz-qt5
65+
base-types
66+
trajectory_follower-viz-qt5
67+
pcl_common${PCL_VERSION_SUFFIX}
68+
pcl_io${PCL_VERSION_SUFFIX}
69+
)
6370

64-
rock_executable(ugv_nav4d_bin-qt5
65-
SOURCES
66-
Main.cpp
67-
DEPS ugv_nav4d ugv_nav4d_gui-qt5
68-
)
71+
rock_executable(ugv_nav4d_bin-qt5
72+
SOURCES
73+
Main.cpp
74+
DEPS ugv_nav4d ugv_nav4d_gui-qt5
75+
)
6976

70-
rock_executable(ugv_nav4d_replay-qt5
71-
SOURCES
72-
ReplayDump.cpp
73-
DEPS ugv_nav4d ugv_nav4d_gui-qt5
74-
DEPS_PKGCONFIG vizkit3d-qt5 maps-viz-qt5 base-viz-qt5
75-
sbpl_spline_primitives-viz-qt5 base-types trajectory_follower-viz-qt5
76-
)
77+
rock_executable(ugv_nav4d_replay-qt5
78+
SOURCES
79+
ReplayDump.cpp
80+
DEPS ugv_nav4d ugv_nav4d_gui-qt5
81+
DEPS_PKGCONFIG vizkit3d-qt5 maps-viz-qt5 base-viz-qt5
82+
sbpl_spline_primitives-viz-qt5 base-types trajectory_follower-viz-qt5
83+
)
84+
else()
85+
message(STATUS "vizkit3d-qt5 not found ... NOT building the ugv_nav4d_gui-qt5")
86+
endif()
7787
endif(ROCK_QT_VERSION_5)

0 commit comments

Comments
 (0)