From fc90ff9692bac13e7e18e592f023478773c97b72 Mon Sep 17 00:00:00 2001 From: Artyom Skrobov Date: Fri, 20 Dec 2013 18:13:12 +0000 Subject: [PATCH] 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 --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cf0faa77d3b..6200de1e37f 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) -- 2.34.1