Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Use of SIMGRID_LIB_PATH and not SIMGRID_LIB
authornavarro <navarro@caraja.(none)>
Wed, 25 Apr 2012 11:15:23 +0000 (13:15 +0200)
committernavarro <navarro@caraja.(none)>
Wed, 25 Apr 2012 11:15:23 +0000 (13:15 +0200)
CMakeLists.txt

index 6b731a4..1ac692b 100644 (file)
@@ -289,10 +289,10 @@ set(test_list basic async pingPong CommTime mutualExclusion bypass kill)
 if(APPLE)
     if($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
         set_tests_properties(${test_list}
-        PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB}")
+        PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}")
     else($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
         set_tests_properties(${test_list}
-        PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=$ENV{DYLD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB}")
+        PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=$ENV{DYLD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}")
     endif($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
 endif(APPLE)
 
@@ -302,10 +302,10 @@ endif(APPLE)
 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}")
+    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}")
+    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)