diff --git a/rviz_ogre_vendor/CMakeLists.txt b/rviz_ogre_vendor/CMakeLists.txt index 623d667e5..e25c6d22e 100644 --- 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 new file mode 100644 index 000000000..92145c404 --- /dev/null +++ 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@