diff options
author | Alexander Neundorf <neundorf@kde.org> | 2007-12-19 21:24:57 +0000 |
---|---|---|
committer | Alexander Neundorf <neundorf@kde.org> | 2007-12-19 21:24:57 +0000 |
commit | 5c4c003ffbd2de9f815fed9dda014b667f3aea5b (patch) | |
tree | 2bc2843059bf8c25870bb6bded0866b5f8c8b8a9 /modules/KDE4Defaults.cmake | |
parent | 010d03f311be293d940e3c9f5baf195d5d2096d3 (diff) | |
download | extra-cmake-modules-5c4c003ffbd2de9f815fed9dda014b667f3aea5b.tar.gz extra-cmake-modules-5c4c003ffbd2de9f815fed9dda014b667f3aea5b.tar.bz2 |
-fix RPATH change from yesterday
The libs and plugins were built with RPATH, but with the install RPATH, which
means that if you run some executable during the build, it may get installed
libs, since the RPATH in the libs points to the install dir. Now the libs are linked with the RPATH
to the build dir, and when installing they are relinked. This unfortunately takes some time.
There are two ways around it:
-set KDE4_USE_ALWAYS_FULL_RPATH to FALSE, then you will have the old behaviour
or
-use cmake cvs and current kdesupport, then the RPATH will be changed not by linking again but by running chrpath on the installed binary, which takes basically no time
Alex
svn path=/trunk/KDE/kdelibs/; revision=750683
Diffstat (limited to 'modules/KDE4Defaults.cmake')
-rw-r--r-- | modules/KDE4Defaults.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/KDE4Defaults.cmake b/modules/KDE4Defaults.cmake index 162dd2f4..b94eaf6d 100644 --- a/modules/KDE4Defaults.cmake +++ b/modules/KDE4Defaults.cmake @@ -21,6 +21,10 @@ set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) # since cmake 2.4.0 set(CMAKE_COLOR_MAKEFILE ON) +# Enable use of chrpath to avoid the need for actually relinking on install +# since cmake cvs 12/19/2007 +set(CMAKE_USE_CHRPATH ON) + # define the generic version of the libraries here # this makes it easy to advance it when the next KDE release comes set(GENERIC_LIB_VERSION "4.0.0") @@ -33,8 +37,6 @@ set(KDE_NON_GENERIC_LIB_SOVERSION "5") # all searchable directories has to be defined by the PATH environment var # to reduce the number of required pathes executables are placed into # the build bin dir -# note: dll's should go also in bin dir and import libraries should go into lib, -# but this seems not possible with recent cmake release if (WIN32) set (EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) # set (LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) |