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 | 478873ce460b42af491168ee033302c1363f732a (patch) | |
| tree | 8248e095a15bde82987e5825dde723ff9b007ad9 /llvm | |
| parent | fa0841c78f01e72429d446e0b9058340ba503e4a (diff) | |
| download | bcm5719-llvm-478873ce460b42af491168ee033302c1363f732a.tar.gz bcm5719-llvm-478873ce460b42af491168ee033302c1363f732a.zip | |
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.
llvm-svn: 201936
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/CMakeLists.txt | 10 |
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) |
