summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-02-22 00:54:14 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-02-22 00:54:14 +0000
commit03bb9e183a6632e0df6fc65acb8176f840b2279c (patch)
tree29ee449226a94fb9fd54884b04fcc8720b31037c /llvm
parent0dc28ea30121753aca53725228f000fe53ca38f3 (diff)
downloadbcm5719-llvm-03bb9e183a6632e0df6fc65acb8176f840b2279c.tar.gz
bcm5719-llvm-03bb9e183a6632e0df6fc65acb8176f840b2279c.zip
Use relative rpath so that the installation and build dirs are relocatable.
This works by asking cmake to use the "install rpath", but setting that rpath to be relative. Thanks a lot to Brad King for the help with CMake! llvm-svn: 201921
Diffstat (limited to 'llvm')
-rw-r--r--llvm/CMakeLists.txt10
1 files changed, 7 insertions, 3 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index cd8b363f7a3..21c64b0b926 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -423,9 +423,13 @@ set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/bin )
set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib )
set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib )
-if( NOT DEFINED CMAKE_INSTALL_RPATH )
- set( CMAKE_INSTALL_RPATH "\$ORIGIN/../lib")
-endif( NOT DEFINED CMAKE_INSTALL_RPATH )
+set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+if (APPLE)
+ set(CMAKE_INSTALL_NAME_DIR "@rpath")
+ set(CMAKE_INSTALL_RPATH "@executable_path/../lib")
+else(UNIX)
+ set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib")
+endif()
set(CMAKE_INCLUDE_CURRENT_DIR ON)
OpenPOWER on IntegriCloud