From aac642b886db08714b0b70d2c4ea1fdfbcfd16bb Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Thu, 7 Jan 2016 09:34:43 -0800 Subject: [PATCH] change CMake logic to determine env var name for library path --- ament_cmake_test/cmake/ament_add_test.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ament_cmake_test/cmake/ament_add_test.cmake b/ament_cmake_test/cmake/ament_add_test.cmake index d0683214..e6c7336d 100644 --- a/ament_cmake_test/cmake/ament_add_test.cmake +++ b/ament_cmake_test/cmake/ament_add_test.cmake @@ -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}")