add .dsv file beside custom environment hook (#449)

Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
ros2 · Aug 21, 2019 · 8e6503e · 8e6503e
1 parent eabf596
commit 8e6503e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/rviz_ogre_vendor/CMakeLists.txt b/rviz_ogre_vendor/CMakeLists.txt
@@ -210,9 +210,18 @@ build_ogre()
 
 if(WIN32)
   ament_environment_hooks(env_hook/rviz_ogre_vendor_library_path.bat)
+  set(ENV_VAR_NAME "PATH")
+  set(ENV_VAR_VALUE "opt\\rviz_ogre_vendor\\bin")
 else()
   ament_environment_hooks(env_hook/rviz_ogre_vendor_library_path.sh)
+  if(APPLE)
+    set(ENV_VAR_NAME "DYLD_LIBRARY_PATH")
+  else()
+    set(ENV_VAR_NAME "LD_LIBRARY_PATH")
+  endif()
+  set(ENV_VAR_VALUE "opt/rviz_ogre_vendor/lib")
 endif()
+ament_environment_hooks(env_hook/rviz_ogre_vendor_library_path.dsv.in)
 
 ament_package(
   CONFIG_EXTRAS "rviz_ogre_vendor-extras.cmake.in"

diff --git a/rviz_ogre_vendor/env_hook/rviz_ogre_vendor_library_path.dsv.in b/rviz_ogre_vendor/env_hook/rviz_ogre_vendor_library_path.dsv.in
@@ -0,0 +1 @@
+prepend-non-duplicate;@ENV_VAR_NAME@;@ENV_VAR_VALUE@