X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cfc0834b7e6f3ce611a7b3991050fb992661538a..5f0a46f004078a0d00c77f430829581d408f526d:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84080cb7bb..38dfa79e5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,7 +215,11 @@ if(WIN32)
     endif(PEXPORTS_PATH)
 else(WIN32)
     target_link_libraries(SG_java pcre pthread simgrid)
-    set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH} -L$ENV{SIMGRID_PCRE_LIBRARY_PATH}/lib")
+    if($ENV{SIMGRID_PCRE_LIBRARY_PATH} STREQUAL "")
+        set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH}")
+    else($ENV{SIMGRID_PCRE_LIBRARY_PATH} STREQUAL "")
+        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(WIN32)
 
 # java_classes
@@ -296,8 +300,7 @@ 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 "")
-
-elseif(APPLE)
+else(APPLE)
     ##########################################
     # Set the  LD_LIBRARY_PATH for our tests #
     ##########################################