diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-12-14 23:30:55 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-12-14 23:30:55 +0000 |
| commit | 8542f5bf442c24a199ba42777cbc763f5e7d54c5 (patch) | |
| tree | d57c865eb0db358ac120254e90c2fbb0a64bb38d /modules/FindKDE4Internal.cmake | |
| parent | 728a5895ce2bd160b3a8748ee15711d942d62ebb (diff) | |
| download | extra-cmake-modules-8542f5bf442c24a199ba42777cbc763f5e7d54c5.tar.gz extra-cmake-modules-8542f5bf442c24a199ba42777cbc763f5e7d54c5.tar.bz2 | |
-remove support for option KDE4_USE_ALWAYS_FULL_RPATH, with cmake >= 2.6.0 we build always with full RPATH
enabled, since the only reason not to do so was because the relinking this caused was slow.
Now with camke 2.6 the libraries and executables don't have to be relinked again, instead the RPATH
inside the binaries is patched, which is *much* faster.
So we can always play safe and use the full RPATH.
I also changed this setting for the Mac, because I don't see why it should be necessary there.
If this breaks something (i.e. when starting an app wrong libs are linked/or they are not found),
please let me know.
Alex
CCMAIL: illogical1@gmail.com
svn path=/trunk/KDE/kdelibs/; revision=897003
Diffstat (limited to 'modules/FindKDE4Internal.cmake')
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 6d839124..13752006 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -890,17 +890,10 @@ if (WIN32) endif (WIN32) -# setup default RPATH/install_name handling, may be overridden by KDE4_HANDLE_RPATH_FOR_[LIBRARY|EXECUTABLE] -# default is to build with RPATH for the install dir, so it doesn't need to relink +# setup default RPATH/install_name handling, may be overridden by KDE4_HANDLE_RPATH_FOR_EXECUTABLE +# It sets up to build with full RPATH. When installing, RPATH will be changed to the LIB_INSTALL_DIR +# and all link directories which are not inside the current build dir. if (UNIX) - if (NOT APPLE) - set( _KDE4_DEFAULT_USE_FULL_RPATH ON ) - else (NOT APPLE) - set( _KDE4_DEFAULT_USE_FULL_RPATH OFF ) - endif (NOT APPLE) - - option(KDE4_USE_ALWAYS_FULL_RPATH "If set to TRUE, also libs and plugins will be linked with the full RPATH, which will usually make them work better, but make install will take longer." ${_KDE4_DEFAULT_USE_FULL_RPATH} ) - set( _KDE4_PLATFORM_INCLUDE_DIRS) # the rest is RPATH handling @@ -912,8 +905,8 @@ if (UNIX) else (APPLE) # add our LIB_INSTALL_DIR to the RPATH and use the RPATH figured out by cmake when compiling set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} ) - set(CMAKE_SKIP_BUILD_RPATH TRUE) - set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) + set(CMAKE_SKIP_BUILD_RPATH FALSE) + set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) endif (APPLE) endif (UNIX) |