diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-02-22 13:29:31 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-02-22 13:29:31 +0000 |
| commit | fb24ccfa32c12dc7ab12b70f2c3db404dbab7581 (patch) | |
| tree | 86831ff26b8f40b562b7385612cf5c2dbbb8e445 /CMakeLists.txt | |
| parent | ea5f6769f61a100d176abcf26775372afa014517 (diff) | |
| download | llvm-fb24ccfa32c12dc7ab12b70f2c3db404dbab7581.tar.gz llvm-fb24ccfa32c12dc7ab12b70f2c3db404dbab7581.tar.bz2 llvm-fb24ccfa32c12dc7ab12b70f2c3db404dbab7581.tar.xz | |
Revert "Revert "Use relative rpath so that the installation and build dirs are relocatable.""
This reverts commit r201934.
Polly has been fixed to work with this.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201936 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cd8b363f7a..21c64b0b92 100644 --- a/CMakeLists.txt +++ b/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) |