Resinstate the command line taking priority over CMakeLists in setting CMAKE_INSTALL_...
authorArtyom Skrobov <Artyom.Skrobov@arm.com>
Fri, 20 Dec 2013 18:13:12 +0000 (18:13 +0000)
committerArtyom Skrobov <Artyom.Skrobov@arm.com>
Fri, 20 Dec 2013 18:13:12 +0000 (18:13 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@197825 91177308-0d34-0410-b5e6-96231b3b80d8

CMakeLists.txt

index cf0faa77d3b31cfb65414a8709683a62193de1a2..6200de1e37f0ba72c4cd70536585d0b48f62f50b 100644 (file)
@@ -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)