From: navarro Date: Wed, 23 May 2012 14:28:00 +0000 (+0200) Subject: Don't try to compare env variable just see if exist. X-Git-Tag: v3_9_90~569^2~19^2~62^2~4 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/28fd1a297a34554ab67781f5fb413bb9a97d521f Don't try to compare env variable just see if exist. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 38dfa79e5e..1e11fb3b6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -215,11 +215,11 @@ if(WIN32) endif(PEXPORTS_PATH) else(WIN32) target_link_libraries(SG_java pcre pthread simgrid) - if($ENV{SIMGRID_PCRE_LIBRARY_PATH} STREQUAL "") + if($ENV{SIMGRID_PCRE_LIBRARY_PATH}) set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH}") - else($ENV{SIMGRID_PCRE_LIBRARY_PATH} STREQUAL "") + else($ENV{SIMGRID_PCRE_LIBRARY_PATH}) set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH} -L$ENV{SIMGRID_PCRE_LIBRARY_PATH}/lib") - endif($ENV{SIMGRID_PCRE_LIBRARY_PATH} STREQUAL "") + endif($ENV{SIMGRID_PCRE_LIBRARY_PATH}) endif(WIN32) # java_classes @@ -293,25 +293,25 @@ set(test_list basic async pingPong CommTime mutualExclusion bypass kill startKil # Set the DYLD_LIBRARY_PATH for mac # ########################################## if(APPLE) - if($ENV{DYLD_LIBRARY_PATH} STREQUAL "") + if($ENV{DYLD_LIBRARY_PATH}) set_tests_properties(${test_list} PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}") - else($ENV{DYLD_LIBRARY_PATH} STREQUAL "") + else($ENV{DYLD_LIBRARY_PATH}) 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($ENV{DYLD_LIBRARY_PATH}) else(APPLE) ########################################## # Set the LD_LIBRARY_PATH for our tests # ########################################## if(NOT WIN32) - if($ENV{LD_LIBRARY_PATH} STREQUAL "") + if($ENV{LD_LIBRARY_PATH}) set_tests_properties(${test_list} PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}") - else($ENV{LD_LIBRARY_PATH} STREQUAL "") + else($ENV{LD_LIBRARY_PATH}) 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($ENV{LD_LIBRARY_PATH}) endif(NOT WIN32) endif(APPLE)