You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
36 lines
1.5 KiB
36 lines
1.5 KiB
11 years ago
|
From cf441af677beade70036453a6480d77d7e702346 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Rex Dieter <rdieter@math.unl.edu>
|
||
|
|
Date: Tue, 5 Nov 2013 20:15:03 -0600
|
||
|
|
Subject: [PATCH 3/3] fix rpath handling
|
||
|
|
|
||
|
|
REVIEW: 113649
|
||
|
|
---
|
||
|
|
cmake/FindPhononInternal.cmake | 10 +++++++---
|
||
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake
|
||
|
|
index b48bfaf..3245e9b 100644
|
||
|
|
--- a/cmake/FindPhononInternal.cmake
|
||
|
|
+++ b/cmake/FindPhononInternal.cmake
|
||
|
|
@@ -217,10 +217,14 @@ endif(APPLE)
|
||
|
|
# RPATH directories outside the current CMAKE_BINARY_DIR and also the library
|
||
|
|
# install directory. Alex
|
||
|
|
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||
|
|
-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
|
||
|
|
-list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir)
|
||
|
|
+set(_abs_LIB_INSTALL_DIR "${LIB_INSTALL_DIR}")
|
||
|
|
+if (NOT IS_ABSOLUTE "${_abs_LIB_INSTALL_DIR}")
|
||
|
|
+ set(_abs_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
|
||
|
|
+endif()
|
||
|
|
+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${_abs_LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
|
||
|
|
+list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${_abs_LIB_INSTALL_DIR}" _isSystemCxxLibDir)
|
||
|
|
if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
|
||
|
|
- set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
|
||
|
|
+ set(CMAKE_INSTALL_RPATH "${_abs_LIB_INSTALL_DIR}")
|
||
|
|
endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
|
||
|
|
|
||
|
|
|
||
|
|
--
|
||
|
|
1.8.4.2
|
||
|
|
|