[llvm] r202302 - Use an install name dir of @executable_path/../lib instead of @rpath.

Rafael Espindola rafael.espindola at gmail.com
Wed Feb 26 13:51:28 PST 2014


Author: rafael
Date: Wed Feb 26 15:51:28 2014
New Revision: 202302

URL: http://llvm.org/viewvc/llvm-project?rev=202302&view=rev
Log:
Use an install name dir of @executable_path/../lib instead of @rpath.

Using @executable_path/../lib matches what we have on Makefiles and works
with older versions of OS X too.

Modified:
    llvm/trunk/CMakeLists.txt

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=202302&r1=202301&r2=202302&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Wed Feb 26 15:51:28 2014
@@ -440,7 +440,7 @@ set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LL
 
 set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 if (APPLE)
-  set(CMAKE_INSTALL_NAME_DIR "@rpath")
+  set(CMAKE_INSTALL_NAME_DIR "@executable_path/../lib")
   set(CMAKE_INSTALL_RPATH "@executable_path/../lib")
 else(UNIX)
   if(NOT DEFINED CMAKE_INSTALL_RPATH)





More information about the llvm-commits mailing list