check against CMAKE_C_IMPLICIT_LINK_DIRECTORIES too move CMAKE_INSTALL_RPATH_USE_LINK_PATH inside conditionalepel9
parent
a70e09c952
commit
c5397d5c68
@ -1,15 +1,18 @@
|
|||||||
diff -up phonon-4.6.0/cmake/FindPhononInternal.cmake.rpath phonon-4.6.0/cmake/FindPhononInternal.cmake
|
diff -up phonon-4.6.0/cmake/FindPhononInternal.cmake.rpath phonon-4.6.0/cmake/FindPhononInternal.cmake
|
||||||
--- phonon-4.6.0/cmake/FindPhononInternal.cmake.rpath 2011-12-19 14:30:45.000000000 -0600
|
--- phonon-4.6.0/cmake/FindPhononInternal.cmake.rpath 2011-12-19 14:30:45.000000000 -0600
|
||||||
+++ phonon-4.6.0/cmake/FindPhononInternal.cmake 2012-05-20 14:38:23.366555537 -0500
|
+++ phonon-4.6.0/cmake/FindPhononInternal.cmake 2012-05-20 15:56:48.031739000 -0500
|
||||||
@@ -123,7 +123,11 @@ endif(APPLE)
|
@@ -122,8 +122,13 @@ endif(APPLE)
|
||||||
|
# These two options below make it set the RPATH of the installed targets to all
|
||||||
# RPATH directories outside the current CMAKE_BINARY_DIR and also the library
|
# RPATH directories outside the current CMAKE_BINARY_DIR and also the library
|
||||||
# install directory. Alex
|
# install directory. Alex
|
||||||
|
+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
|
||||||
|
+list(FIND CMAKE_C_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}" _isSystemCLibDir)
|
||||||
|
+list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "%{CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}" _isSystemCxxLibDir)
|
||||||
|
+if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
|
||||||
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||||
+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
|
-set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
|
||||||
+list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir)
|
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
|
||||||
+if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
|
+endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
|
||||||
set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
|
|
||||||
+endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
|
|
||||||
|
|
||||||
|
|
||||||
# Uninstall Target
|
# Uninstall Target
|
||||||
|
Loading…
Reference in new issue