X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ad8b918b33a4dcfbcff84a443ad0cb34d6ebe97..d1a82dae27086cc6f9ea4e0163d2941c74135c94:/tools/cmake/MakeLib.cmake

diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake
index d116926c75..6f4cf6b299 100644
--- a/tools/cmake/MakeLib.cmake
+++ b/tools/cmake/MakeLib.cmake
@@ -4,10 +4,13 @@
 # See https://cmake.org/Wiki/CMake_RPATH_handling and Java.cmake
 set(MACOSX_RPATH ON)
 if(APPLE)
+  SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # When installed, use system path
+  set(CMAKE_SKIP_BUILD_RPATH FALSE)         # When executing from build tree, take the lib from the build path if exists
+  set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) # When executing from build tree, take the lib from the system path if exists
+  
   # add the current location of libsimgrid-java.dynlib as a location for libsimgrid.dynlib
-  # (useful when unpacking the native libraries from the jarfile)
-  set(CMAKE_INSTALL_RPATH "@loader_path/.")
-  SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+  # (useful when unpacking the native libraries from the jarfile)
+  set(CMAKE_INSTALL_RPATH "@loader_path/.;@rpath/.")
 endif()
 
 ###############################