From 5c011b06e94aa7e857d8ed819d89ef74d306a670 Mon Sep 17 00:00:00 2001 From: navarrop Date: Wed, 7 Sep 2011 15:18:06 +0000 Subject: [PATCH] On mac we must set DYLD_LIBRARY_PATH to find libsimgrid.dylib git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/contrib/trunk/simgrid-java@9906 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- CMakeLists.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f8e31b6ff..2ab2fb5550 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -222,6 +222,19 @@ ADD_TEST(mutualExclusion java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar mutualExclusion/centralized/MutexCentral ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/ring3.xml ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/mutex_centralized_deployment.xml ) +########################################## +# Set the DYLD_LIBRARY_PATH for mac # +########################################## +if(APPLE) + if($ENV{DYLD_LIBRARY_PATH} STREQUAL "") + set_tests_properties(basic pingPong CommTime mutualExclusion + PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:$ENV{SIMGRID_ROOT}/lib") + else($ENV{DYLD_LIBRARY_PATH} STREQUAL "") + set_tests_properties(basic pingPong CommTime mutualExclusion + PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=$ENV{DYLD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:$ENV{SIMGRID_ROOT}/lib") + endif($ENV{DYLD_LIBRARY_PATH} STREQUAL "") +endif(APPLE) + ########################################## # Set the LD_LIBRARY_PATH for our tests # ########################################## -- 2.20.1