[llvm] r202085 - Permit CMAKE_INSTALL_RPATH to be set on command line

[Bernard Ogden]

Of course, that should have read ‘to only set CMAKE_INSTALL_RPATH’ if NOT already defined...

On 24 Feb 2014, at 22:23, Bernard Ogden <bogden at arm.com> wrote:

> Author: bogden
> Date: Mon Feb 24 16:23:43 2014
> New Revision: 202085
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=202085&view=rev
> Log:
> 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.
> 
> Modified:
>   llvm/trunk/CMakeLists.txt
> 
> Modified: llvm/trunk/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=202085&r1=202084&r2=202085&view=diff
> ==============================================================================
> --- llvm/trunk/CMakeLists.txt (original)
> +++ llvm/trunk/CMakeLists.txt Mon Feb 24 16:23:43 2014
> @@ -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)
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>