diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2009-01-06 19:07:27 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2009-01-06 19:07:27 +0000 |
| commit | 8b201905bc247e7544d31ab4f4cbbf288f34b416 (patch) | |
| tree | 4cc28179301c71ebf98648ada2f9d392e0b15b00 | |
| parent | 6280df3dd62e0fea5d8cf35f63ea5a6453841c66 (diff) | |
| download | extra-cmake-modules-8b201905bc247e7544d31ab4f4cbbf288f34b416.tar.gz extra-cmake-modules-8b201905bc247e7544d31ab4f4cbbf288f34b416.tar.bz2 | |
-rename the export files to KDELibs4(Library|Tools)Targets.cmake from KDELibs(Library|Tools)Targets.cmake, same patch as in trunk. Fixes the problem with the added namespace for the targets exported from kdelibs a few weeks ago.
Patch which will make this safe for the case we have similar changes in the future will first go to trunk, and after RC1 into the branch.
Alex
svn path=/branches/KDE/4.2/kdelibs/; revision=906738
| -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 |