Fixes environment hooks.

Signed-off-by: Franco Cipollone <franco.c@ekumenlabs.com>
maliput · Jul 1, 2022 · 1e2a943 · 1e2a943
1 parent c27b607
commit 1e2a943
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 87 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -68,7 +68,8 @@ endif()
 # Export
 ##############################################################################
 
-ament_environment_hooks(setup.sh.in)
+ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/env-hooks/${PROJECT_NAME}.dsv.in")
+ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/env-hooks/${PROJECT_NAME}.sh.in")
 
 install(
   DIRECTORY include/

diff --git a/env-hooks/maliput_dragway.dsv.in b/env-hooks/maliput_dragway.dsv.in
@@ -0,0 +1 @@
+prepend-non-duplicate;MALIPUT_PLUGIN_PATH;lib/maliput_plugins
diff --git a/env-hooks/maliput_dragway.sh.in b/env-hooks/maliput_dragway.sh.in
@@ -0,0 +1 @@
+ament_prepend_unique_value MALIPUT_PLUGIN_PATH "$AMENT_CURRENT_PREFIX/lib/maliput_plugins"
diff --git a/setup.sh.in b/setup.sh.in
diff --git a/src/plugin/CMakeLists.txt b/src/plugin/CMakeLists.txt
@@ -31,7 +31,7 @@ target_include_directories(road_network
 # Using a different location as this target is a dynamic library
 # which will be loaded in runtime as a maliput plugin.
 set(PLUGIN_INSTALL_DIR
-    lib/plugins
+    lib/maliput_plugins
 )
 
 install(

diff --git a/test/plugin/CMakeLists.txt b/test/plugin/CMakeLists.txt
@@ -17,7 +17,7 @@ macro(add_dependencies_to_test target)
           ENABLE_EXPORTS ON
       )
 
-      set(ROAD_NETWORK_PLUGIN ${CMAKE_INSTALL_PREFIX}/lib/plugins/)
+      set(ROAD_NETWORK_PLUGIN ${CMAKE_INSTALL_PREFIX}/lib/maliput_plugins/)
       target_compile_definitions(${target}
         PRIVATE
           DEF_ROAD_NETWORK_PLUGIN="${ROAD_NETWORK_PLUGIN}"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		prepend-non-duplicate;MALIPUT_PLUGIN_PATH;lib/maliput_plugins
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ament_prepend_unique_value MALIPUT_PLUGIN_PATH "$AMENT_CURRENT_PREFIX/lib/maliput_plugins"