[PATCH] D26289: [CMake] Fix llvm_setup_rpath function

[Azharuddin Mohammed via llvm-commits]

azharudd created this revision.
azharudd added reviewers: john.brawn, beanz.
azharudd added a subscriber: llvm-commits.
Herald added a subscriber: mgorny.

Set _install_rpath to CMAKE_INSTALL_RPATH if it is defined, so that eventually
INSTALL_RPATH is set to CMAKE_INSTALL_RPATH.

      

The "if(NOT DEFINED CMAKE_INSTALL_RPATH)" was missing a corresponding else
clause.

      

This also cleans up the fix made in r285908.

      

Patch by Azharuddin Mohammed


https://reviews.llvm.org/D26289

Files:
  cmake/modules/AddLLVM.cmake


Index: cmake/modules/AddLLVM.cmake
===================================================================
--- cmake/modules/AddLLVM.cmake
+++ cmake/modules/AddLLVM.cmake
@@ -1346,15 +1346,15 @@
         set_property(TARGET ${name} APPEND_STRING PROPERTY
                      LINK_FLAGS " -Wl,-rpath-link,${LLVM_LIBRARY_OUTPUT_INTDIR} ")
       endif()
+    else()
+      set(_install_rpath ${CMAKE_INSTALL_RPATH})
     endif()
   else()
     return()
   endif()
 
-  if(DEFINED _install_rpath)
-    set_target_properties(${name} PROPERTIES
-                          BUILD_WITH_INSTALL_RPATH On
-                          INSTALL_RPATH "${_install_rpath}"
-                          ${_install_name_dir})
-  endif()
+  set_target_properties(${name} PROPERTIES
+                        BUILD_WITH_INSTALL_RPATH On
+                        INSTALL_RPATH "${_install_rpath}"
+                        ${_install_name_dir})
 endfunction()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D26289.76884.patch
Type: text/x-patch
Size: 932 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20161103/df56d949/attachment.bin>