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.
18 lines
1.2 KiB
18 lines
1.2 KiB
11 years ago
|
diff -up phonon-4.7.0/cmake/FindPhononInternal.cmake.rpath phonon-4.7.0/cmake/FindPhononInternal.cmake
|
||
|
|
--- phonon-4.7.0/cmake/FindPhononInternal.cmake.rpath 2013-11-04 10:49:06.000000000 -0600
|
||
|
|
+++ phonon-4.7.0/cmake/FindPhononInternal.cmake 2013-11-04 19:29:26.793926526 -0600
|
||
|
|
@@ -217,10 +217,10 @@ 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)
|
||
|
|
+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
|
||
|
|
+list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}" _isSystemCxxLibDir)
|
||
|
|
if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
|
||
|
|
- set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
|
||
|
|
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
|
||
|
|
endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
|
||
|
|
|
||
|
|
|