diff options
author | Artyom Skrobov <Artyom.Skrobov@arm.com> | 2013-12-20 18:13:12 +0000 |
---|---|---|
committer | Artyom Skrobov <Artyom.Skrobov@arm.com> | 2013-12-20 18:13:12 +0000 |
commit | fc90ff9692bac13e7e18e592f023478773c97b72 (patch) | |
tree | 092a69d0c9405ae9252c12c74320b2b25b8a07bd /CMakeLists.txt | |
parent | ed4678820bf3e278dc660ca4dda8e79d268b0b08 (diff) | |
download | llvm-fc90ff9692bac13e7e18e592f023478773c97b72.tar.gz llvm-fc90ff9692bac13e7e18e592f023478773c97b72.tar.bz2 llvm-fc90ff9692bac13e7e18e592f023478773c97b72.tar.xz |
Resinstate the command line taking priority over CMakeLists in setting CMAKE_INSTALL_RPATH
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@197825 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cf0faa77d3..6200de1e37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -411,7 +411,9 @@ set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_TOOLS_BINARY_DIR} ) set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib ) set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib ) -set( CMAKE_INSTALL_RPATH "\$ORIGIN/../lib") +if( NOT DEFINED CMAKE_INSTALL_RPATH ) + set( CMAKE_INSTALL_RPATH "\$ORIGIN/../lib") +endif( NOT DEFINED CMAKE_INSTALL_RPATH ) set(CMAKE_INCLUDE_CURRENT_DIR ON) |