diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2009-01-06 18:33:02 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2009-01-06 18:33:02 +0000 |
| commit | 85b8a06b9be6673fd3c12114e4e073961e6fad7a (patch) | |
| tree | 9f455842b29f44db83e234a09b1abf392416f9e6 | |
| parent | cb5d64618a470700e0ff86435cecc64ca46afcac (diff) | |
| download | extra-cmake-modules-85b8a06b9be6673fd3c12114e4e073961e6fad7a.tar.gz extra-cmake-modules-85b8a06b9be6673fd3c12114e4e073961e6fad7a.tar.bz2 | |
-install the exports file as KDELibs4LibraryTargets.cmake, instead of KDELibsLibraryTargets.cmake -> fix against the problem which happens if you have a relatively old kdelibs installation (when the targets where exported without "namespace"), then switched the buildtype and installed a new kdelibs
The patch which makes this safe for the case that we have similar changes in the future will come later today.
Alex
svn path=/trunk/KDE/kdelibs/; revision=906725
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 37d1f8c3..0d50b2d5 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -439,7 +439,7 @@ else (_kdeBootStrapping) # the kdeui library could now also be used just as "KDE4__kdeui" and still have all their # dependent libraries handled correctly. But to keep compatibility and not to change # behaviour we set all these variables anyway as seen below. Alex - include(${kde_cmake_module_dir}/KDELibsLibraryTargets.cmake) + include(${kde_cmake_module_dir}/KDELibs4LibraryTargets.cmake) # helper macro, sets both the KDE4_FOO_LIBRARY and KDE4_FOO_LIBS variables to KDE4__foo macro(_KDE4_SET_LIB_VARIABLES _var _lib _prefix) @@ -497,7 +497,7 @@ else (_kdeBootStrapping) # now include the file with the imported tools (executable targets) # Having the libs and tools in two separate files should help with cross compiling. - include(${kde_cmake_module_dir}/KDELibsToolsTargets.cmake) + include(${kde_cmake_module_dir}/KDELibs4ToolsTargets.cmake) # get the build CONFIGURATIONS which were exported in this file, and use just the first # of them to get the location of the installed executables |