Permit CMAKE_INSTALL_RPATH to be set on command line

Commit 201921 overrides setting of CMAKE_INSTALL_RPATH via the
command line. Last time this happened we applied another patch
to only set CMAKE_INSTALL_RPATH if already defined (r197825).
This patch does the same thing again, but only for the UNIX
case - we leave APPLE alone as presumably the original committer
is happy with the non-overriding behaviour.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@202085 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21c64b0b926c5e09063270669141534f2c8773ed..aa2fe14fe239f8417aea874ebe1b9a7c31e45b10 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -428,7 +428,9 @@ if (APPLE)
   set(CMAKE_INSTALL_NAME_DIR "@rpath")
   set(CMAKE_INSTALL_RPATH "@executable_path/../lib")
 else(UNIX)
-  set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib")
+  if(NOT DEFINED CMAKE_INSTALL_RPATH)
+    set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib")
+  endif(NOT DEFINED CMAKE_INSTALL_RPATH)
 endif()
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)