parent
aa842645a9
commit
a70e09c952
@ -1,14 +0,0 @@
|
||||
diff -up phonon-4.4.4/cmake/FindPhononInternal.cmake.no_rpath phonon-4.4.4/cmake/FindPhononInternal.cmake
|
||||
--- phonon-4.4.4/cmake/FindPhononInternal.cmake.no_rpath 2011-01-19 13:20:00.000000000 -0600
|
||||
+++ phonon-4.4.4/cmake/FindPhononInternal.cmake 2011-01-21 09:02:08.242131811 -0600
|
||||
@@ -232,8 +232,8 @@ 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
|
||||
# install directory. Alex
|
||||
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
-set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
|
||||
+#set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
+#set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
|
||||
|
||||
|
||||
# Uninstall Target
|
@ -0,0 +1,15 @@
|
||||
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 2012-05-20 14:38:23.366555537 -0500
|
||||
@@ -123,7 +123,11 @@ 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)
|
||||
+if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
|
||||
set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
|
||||
+endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
|
||||
|
||||
|
||||
# Uninstall Target
|
Loading…
Reference in new issue