Added ament hooks to track blue description files (#296)

evan-palmer · web-flow · commit f74bcd2510f2 · 2024-09-14T11:23:10.000-07:00
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -243,13 +243,6 @@ export GZ_SIM_SYSTEM_PLUGIN_PATH=\$HOME/ardupilot_gazebo/build:\$GZ_SIM_SYSTEM_P
 
 # Add ardupilot_gazebo models and worlds
 export GZ_SIM_RESOURCE_PATH=\$HOME/ardupilot_gazebo/models:\$HOME/ardupilot_gazebo/worlds:\$GZ_SIM_RESOURCE_PATH
-
-# Add blue models and worlds
-BLUE_DESCRIPTION=\$USER_WORKSPACE/src/blue/blue_description
-export GZ_SIM_RESOURCE_PATH=\$BLUE_DESCRIPTION/gazebo/models:\$BLUE_DESCRIPTION/gazebo/worlds:\$GZ_SIM_RESOURCE_PATH
-
-# Add blue meshes
-export GZ_SIM_RESOURCE_PATH=\$BLUE_DESCRIPTION/meshes:\$GZ_SIM_RESOURCE_PATH
 EOT
 
 FROM desktop AS desktop-nvidia
diff --git a/blue_description/CMakeLists.txt b/blue_description/CMakeLists.txt
@@ -8,4 +8,6 @@ install(
   DESTINATION share/blue_description
 )
 
+ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/hooks/hooks.dsv.in")
+
 ament_package()
diff --git a/blue_description/hooks/hooks.dsv.in b/blue_description/hooks/hooks.dsv.in
@@ -0,0 +1,2 @@
+prepend-non-duplicate;GZ_SIM_RESOURCE_PATH;@CMAKE_INSTALL_PREFIX@/share/@PROJECT_NAME@/gazebo/models
+prepend-non-duplicate;GZ_SIM_RESOURCE_PATH;@CMAKE_INSTALL_PREFIX@/share/@PROJECT_NAME@/gazebo/worlds

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,6 @@ install(`
`8`	`8`	`DESTINATION share/blue_description`
`9`	`9`	`)`
`10`	`10`
	`11`	`+ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/hooks/hooks.dsv.in")`
	`12`	`+`
`11`	`13`	`ament_package()`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+prepend-non-duplicate;GZ_SIM_RESOURCE_PATH;@CMAKE_INSTALL_PREFIX@/share/@PROJECT_NAME@/gazebo/models`
	`2`	`+prepend-non-duplicate;GZ_SIM_RESOURCE_PATH;@CMAKE_INSTALL_PREFIX@/share/@PROJECT_NAME@/gazebo/worlds`