From: John Brawn <john.brawn@arm.com>
Date: Thu, 3 Nov 2016 13:55:04 +0000 (+0000)
Subject: [CMake] Make CMAKE_INSTALL_RPATH work again
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0e0673b0f73cebabf73e8a7817e871ad54cb24f;p=llvm

[CMake] Make CMAKE_INSTALL_RPATH work again

r285714 made it so that when CMAKE_INSTALL_RPATH is set _install_rpath is not
set, but that means INSTALL_RPATH gets set to an empty string which isn't what
we want. Fix this by setting INSTALL_RPATH only when _install_rpath is set.


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

diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
index 32ef66ab7c4..238b8810f42 100644
--- a/cmake/modules/AddLLVM.cmake
+++ b/cmake/modules/AddLLVM.cmake
@@ -1351,8 +1351,10 @@ function(llvm_setup_rpath name)
     return()
   endif()
 
-  set_target_properties(${name} PROPERTIES
-                        BUILD_WITH_INSTALL_RPATH On
-                        INSTALL_RPATH "${_install_rpath}"
-                        ${_install_name_dir})
+  if(DEFINED _install_rpath)
+    set_target_properties(${name} PROPERTIES
+                          BUILD_WITH_INSTALL_RPATH On
+                          INSTALL_RPATH "${_install_rpath}"
+                          ${_install_name_dir})
+  endif()
 endfunction()