X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/25fa04f8ceaf4b43a87d0df425073ec22f7b1d9e..cfc0834b7e6f3ce611a7b3991050fb992661538a:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 660e1aa8d0..84080cb7bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -296,20 +296,21 @@ if(APPLE) set_tests_properties(${test_list} PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=$ENV{DYLD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}") endif($ENV{DYLD_LIBRARY_PATH} STREQUAL "") -endif(APPLE) -########################################## -# Set the LD_LIBRARY_PATH for our tests # -########################################## -if(NOT WIN32) -if($ENV{LD_LIBRARY_PATH} STREQUAL "") - set_tests_properties(${test_list} - PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}") -else($ENV{LD_LIBRARY_PATH} STREQUAL "") - set_tests_properties(${test_list} - PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}") -endif($ENV{LD_LIBRARY_PATH} STREQUAL "") -endif(NOT WIN32) +elseif(APPLE) + ########################################## + # Set the LD_LIBRARY_PATH for our tests # + ########################################## + if(NOT WIN32) + if($ENV{LD_LIBRARY_PATH} STREQUAL "") + set_tests_properties(${test_list} + PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}") + else($ENV{LD_LIBRARY_PATH} STREQUAL "") + set_tests_properties(${test_list} + PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}") + endif($ENV{LD_LIBRARY_PATH} STREQUAL "") + endif(NOT WIN32) +endif(APPLE) ########### # Install #