[llvm] r197825 - Resinstate the command line taking priority over CMakeLists in setting CMAKE_INSTALL_RPATH

[Artyom Skrobov]

Author: askrobov
Date: Fri Dec 20 12:13:12 2013
New Revision: 197825

URL: http://llvm.org/viewvc/llvm-project?rev=197825&view=rev
Log:
Resinstate the command line taking priority over CMakeLists in setting CMAKE_INSTALL_RPATH

Modified:
    llvm/trunk/CMakeLists.txt

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=197825&r1=197824&r2=197825&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Fri Dec 20 12:13:12 2013
@@ -411,7 +411,9 @@ set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LL
 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)