Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change CMake logic to determine env var name for library path #53

Merged
merged 1 commit into from
Jan 11, 2016
Merged

change CMake logic to determine env var name for library path #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ament_cmake_test/cmake/ament_add_test.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ function(ament_add_test testname)
endif()
if(ARG_APPEND_LIBRARY_DIRS)
if(WIN32)
set(_library_dirs_env_var PATH)
endif()
if(UNIX AND NOT APPLE)
set(_library_dirs_env_var LD_LIBRARY_PATH)
endif()
if(APPLE)
set(_library_dirs_env_var DYLD_LIBRARY_PATH)
set(_library_dirs_env_var "PATH")
elseif(APPLE)
set(_library_dirs_env_var "DYLD_LIBRARY_PATH")
elseif(UNIX)
set(_library_dirs_env_var "LD_LIBRARY_PATH")
else()
message(FATAL_ERROR "Unknown platform for environment variable to find libraries")
endif()
foreach(_dir ${ARG_APPEND_LIBRARY_DIRS})
list(APPEND ARG_APPEND_ENV "${_library_dirs_env_var}=${_dir}")
Expand Down