Skip to content

Commit 8f25bfc

Browse files
luca-della-vedovaluca-della-vedova
committed
Move to vendored gz packages
Signed-off-by: Luca Della Vedova <[email protected]>
1 parent 7b99b86 commit 8f25bfc

File tree

4 files changed

+109
-88
lines changed

4 files changed

+109
-88
lines changed

‎rmf_building_sim_gz_plugins/CMakeLists.txt‎

Lines changed: 49 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,21 @@ find_package(rmf_lift_msgs REQUIRED)
2323
find_package(ament_cmake REQUIRED)
2424
find_package(rclcpp REQUIRED)
2525

26-
find_package(gz-cmake3 REQUIRED)
27-
28-
gz_find_package(gz-sim8 REQUIRED)
29-
set(GZ_SIM_VER 8)
30-
gz_find_package(gz-plugin2 REQUIRED COMPONENTS register)
31-
set(GZ_PLUGIN_VER 2)
32-
gz_find_package(gz-common5 REQUIRED)
33-
set(GZ_COMMON_VER 5)
34-
gz_find_package(gz-math7 REQUIRED)
35-
set(GZ_MATH_VER 7)
36-
gz_find_package(gz-gui8 REQUIRED)
37-
set(GZ_GUI_VER 8)
38-
gz_find_package(gz-msgs10 REQUIRED)
39-
set(GZ_MSGS_VER 10)
40-
gz_find_package(gz-transport13 REQUIRED)
41-
set(GZ_TRANSPORT_VER 13)
42-
gz_find_package(gz-rendering8 REQUIRED)
43-
set(GZ_RENDERING_VER 8)
44-
gz_find_package(sdformat14 REQUIRED)
45-
26+
find_package(gz_sim_vendor REQUIRED)
27+
find_package(gz-sim REQUIRED)
28+
find_package(gz_plugin_vendor REQUIRED)
29+
find_package(gz-plugin REQUIRED)
30+
find_package(gz_gui_vendor REQUIRED)
31+
find_package(gz-gui REQUIRED)
32+
find_package(gz_msgs_vendor REQUIRED)
33+
find_package(gz-msgs REQUIRED)
34+
find_package(gz_transport_vendor REQUIRED)
35+
find_package(gz-transport REQUIRED)
36+
find_package(gz_rendering_vendor REQUIRED)
37+
find_package(gz-rendering REQUIRED)
4638

4739
find_package(rmf_fleet_msgs REQUIRED)
48-
find_package (Qt5
40+
find_package(Qt5
4941
COMPONENTS
5042
Core
5143
Qml
@@ -68,11 +60,13 @@ target_include_directories(door
6860
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
6961
)
7062

63+
target_link_libraries(door
64+
gz-sim::core
65+
gz-plugin::core
66+
)
67+
7168
ament_target_dependencies(door
72-
PUBLIC
7369
rclcpp
74-
gz-sim${GZ_SIM_VER}
75-
gz-plugin${GZ_PLUGIN_VER}
7670
rmf_door_msgs
7771
)
7872

@@ -87,10 +81,9 @@ target_include_directories(register_component
8781
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
8882
)
8983

90-
ament_target_dependencies(register_component
91-
PUBLIC
92-
gz-sim${GZ_SIM_VER}
93-
gz-plugin${GZ_PLUGIN_VER}
84+
target_link_libraries(register_component
85+
gz-sim::core
86+
gz-plugin::core
9487
)
9588

9689
###############################
@@ -106,13 +99,15 @@ target_include_directories(lift
10699
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
107100
)
108101

102+
target_link_libraries(lift
103+
gz-sim::core
104+
gz-plugin::core
105+
)
106+
109107
ament_target_dependencies(lift
110-
PUBLIC
111-
rclcpp
112-
gz-sim${GZ_SIM_VER}
113-
gz-plugin${GZ_PLUGIN_VER}
114-
rmf_lift_msgs
115-
rmf_door_msgs
108+
rclcpp
109+
rmf_lift_msgs
110+
rmf_door_msgs
116111
)
117112

118113
###############################
@@ -130,9 +125,12 @@ target_include_directories(crowd_simulator
130125
${menge_vendor_INCLUDE_DIRS}
131126
)
132127

128+
target_link_libraries(crowd_simulator
129+
gz-sim::core
130+
gz-plugin::core
131+
)
132+
133133
ament_target_dependencies(crowd_simulator
134-
gz-sim${GZ_SIM_VER}
135-
gz-plugin${GZ_PLUGIN_VER}
136134
rclcpp
137135
menge_vendor
138136
)
@@ -148,10 +146,13 @@ add_library(toggle_charging SHARED ${headers_MOC}
148146
${resources_RCC}
149147
)
150148

149+
target_link_libraries(toggle_charging
150+
gz-sim::core
151+
gz-msgs::core
152+
gz-transport::core
153+
)
154+
151155
ament_target_dependencies(toggle_charging
152-
gz-gui${GZ_GUI_VER}
153-
gz-msgs${GZ_MSGS_VER}
154-
gz-transport${GZ_TRANSPORT_VER}
155156
Qt5Core
156157
Qt5Qml
157158
Qt5Quick
@@ -176,13 +177,16 @@ add_library(toggle_floors SHARED ${headers_MOC}
176177
${resources_RCC}
177178
)
178179

180+
target_link_libraries(toggle_floors
181+
gz-sim::core
182+
gz-gui::core
183+
gz-msgs::core
184+
gz-plugin::core
185+
gz-rendering::core
186+
gz-transport::core
187+
)
188+
179189
ament_target_dependencies(toggle_floors
180-
gz-sim${GZ_SIM_VER}
181-
gz-gui${GZ_GUI_VER}
182-
gz-msgs${GZ_MSGS_VER}
183-
gz-plugin${GZ_PLUGIN_VER}
184-
gz-rendering${GZ_RENDERING_VER}
185-
gz-transport${GZ_TRANSPORT_VER}
186190
Qt5Core
187191
Qt5Qml
188192
Qt5Quick

‎rmf_building_sim_gz_plugins/package.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@
2222
<depend>libqt5-qml</depend>
2323
<depend>libqt5-quick</depend>
2424
<depend>menge_vendor</depend>
25-
<!--<depend>ignition-fortress</depend>-->
25+
<depend>gz_gui_vendor</depend>
26+
<depend>gz_msgs_vendor</depend>
27+
<depend>gz_plugin_vendor</depend>
28+
<depend>gz_rendering_vendor</depend>
29+
<depend>gz_sim_vendor</depend>
30+
<depend>gz_transport_vendor</depend>
2631

2732
<export>
2833
<build_type>ament_cmake</build_type>

‎rmf_robot_sim_gz_plugins/CMakeLists.txt‎

Lines changed: 48 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,18 @@ endif()
2222
find_package(ament_cmake REQUIRED)
2323
find_package(rclcpp REQUIRED)
2424

25-
find_package(gz-cmake3 REQUIRED)
26-
27-
gz_find_package(gz-sim8 REQUIRED)
28-
set(GZ_SIM_VER 8)
29-
gz_find_package(gz-plugin2 REQUIRED COMPONENTS register)
30-
set(GZ_PLUGIN_VER 2)
31-
gz_find_package(gz-common5 REQUIRED)
32-
set(GZ_COMMON_VER 5)
33-
gz_find_package(gz-math7 REQUIRED)
34-
set(GZ_MATH_VER 7)
35-
gz_find_package(gz-gui8 REQUIRED)
36-
set(GZ_GUI_VER 8)
37-
gz_find_package(gz-msgs10 REQUIRED)
38-
set(GZ_MSGS_VER 10)
39-
gz_find_package(gz-transport13 REQUIRED)
40-
set(GZ_TRANSPORT_VER 13)
41-
gz_find_package(gz-rendering8 REQUIRED)
42-
set(GZ_RENDERING_VER 8)
43-
gz_find_package(sdformat14 REQUIRED)
25+
find_package(gz_sim_vendor REQUIRED)
26+
find_package(gz-sim REQUIRED)
27+
find_package(gz_plugin_vendor REQUIRED)
28+
find_package(gz-plugin REQUIRED)
29+
find_package(gz_gui_vendor REQUIRED)
30+
find_package(gz-gui REQUIRED)
31+
find_package(gz_msgs_vendor REQUIRED)
32+
find_package(gz-msgs REQUIRED)
33+
find_package(gz_transport_vendor REQUIRED)
34+
find_package(gz-transport REQUIRED)
35+
find_package(gz_rendering_vendor REQUIRED)
36+
find_package(gz-rendering REQUIRED)
4437

4538
find_package(Eigen3 REQUIRED)
4639
find_package(rmf_fleet_msgs REQUIRED)
@@ -63,11 +56,14 @@ include(GNUInstallDirs)
6356

6457
add_library(teleport_ingestor SHARED src/TeleportIngestor.cpp)
6558

59+
target_link_libraries(teleport_ingestor
60+
gz-sim::core
61+
gz-plugin::core
62+
gz-msgs::core
63+
gz-transport::core
64+
)
65+
6666
ament_target_dependencies(teleport_ingestor
67-
gz-sim${GZ_SIM_VER}
68-
gz-plugin${GZ_PLUGIN_VER}
69-
gz-msgs${GZ_MSGS_VER}
70-
gz-transport${GZ_TRANSPORT_VER}
7167
rmf_fleet_msgs
7268
rclcpp
7369
rmf_robot_sim_common
@@ -87,11 +83,14 @@ target_include_directories(teleport_ingestor
8783

8884
add_library(teleport_dispenser SHARED src/TeleportDispenser.cpp)
8985

86+
target_link_libraries(teleport_dispenser
87+
gz-sim::core
88+
gz-plugin::core
89+
gz-msgs::core
90+
gz-transport::core
91+
)
92+
9093
ament_target_dependencies(teleport_dispenser
91-
gz-sim${GZ_SIM_VER}
92-
gz-plugin${GZ_PLUGIN_VER}
93-
gz-msgs${GZ_MSGS_VER}
94-
gz-transport${GZ_TRANSPORT_VER}
9594
rmf_fleet_msgs
9695
rclcpp
9796
rmf_robot_sim_common
@@ -111,12 +110,15 @@ target_include_directories(teleport_dispenser
111110

112111
add_library(readonly SHARED ${PROJECT_SOURCE_DIR}/src/readonly.cpp)
113112

113+
target_link_libraries(readonly
114+
gz-sim::core
115+
gz-plugin::core
116+
)
117+
114118
ament_target_dependencies(readonly
115119
rmf_fleet_msgs
116120
rmf_building_map_msgs
117121
rclcpp
118-
gz-sim${GZ_SIM_VER}
119-
gz-plugin${GZ_PLUGIN_VER}
120122
rmf_robot_sim_common
121123
Eigen3
122124
)
@@ -134,14 +136,16 @@ target_include_directories(readonly
134136

135137
add_library(slotcar SHARED ${PROJECT_SOURCE_DIR}/src/slotcar.cpp)
136138

139+
target_link_libraries(slotcar
140+
gz-sim::core
141+
gz-plugin::core
142+
)
143+
137144
ament_target_dependencies(slotcar
138-
PUBLIC
139-
gz-sim${GZ_SIM_VER}
140-
gz-plugin${GZ_PLUGIN_VER}
141-
rmf_robot_sim_common
142-
rmf_building_sim_gz_plugins
143-
rmf_fleet_msgs
144-
rclcpp
145+
rmf_robot_sim_common
146+
rmf_building_sim_gz_plugins
147+
rmf_fleet_msgs
148+
rclcpp
145149
)
146150

147151
target_include_directories(slotcar
@@ -165,12 +169,15 @@ add_library(LightTuning SHARED ${headers_MOC}
165169
${resources_RCC}
166170
)
167171

172+
target_link_libraries(LightTuning
173+
gz-gui::core
174+
gz-sim::core
175+
gz-msgs::core
176+
gz-transport::core
177+
gz-rendering::core
178+
)
179+
168180
ament_target_dependencies(LightTuning
169-
gz-gui${GZ_GUI_VER}
170-
gz-sim${GZ_SIM_VER}
171-
gz-msgs${GZ_MSGS_VER}
172-
gz-transport${GZ_TRANSPORT_VER}
173-
gz-rendering${GZ_RENDERING_VER}
174181
Qt5Core
175182
Qt5Qml
176183
Qt5Quick

‎rmf_robot_sim_gz_plugins/package.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,12 @@
2323
<depend>libqt5-core</depend>
2424
<depend>libqt5-qml</depend>
2525
<depend>libqt5-quick</depend>
26-
<!-- <depend>ignition-fortress</depend>-->
26+
<depend>gz_gui_vendor</depend>
27+
<depend>gz_msgs_vendor</depend>
28+
<depend>gz_plugin_vendor</depend>
29+
<depend>gz_rendering_vendor</depend>
30+
<depend>gz_sim_vendor</depend>
31+
<depend>gz_transport_vendor</depend>
2732

2833
<export>
2934
<build_type>ament_cmake</build_type>

0 commit comments

Comments
 (0)