diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-12-03 18:43:27 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-12-03 18:43:27 +0000 |
| commit | 4c183f990df8a96627f057224d73349061e74909 (patch) | |
| tree | 483a28b65205b155466eeac7c01528d21430255c | |
| parent | e0109ea9c73f23d308d43dac6e8aec49a734ca38 (diff) | |
| download | extra-cmake-modules-4c183f990df8a96627f057224d73349061e74909.tar.gz extra-cmake-modules-4c183f990df8a96627f057224d73349061e74909.tar.bz2 | |
-prefix the targets exported from kdepimlibs with "KDEPIMLibs::", this should fix building kdebindings
-support both version of the file, with and without prefix until next monday
Using "::" in imported target names works here, I have no idea whether this might break with nmake/XCode/MSVC...
Please let me know if it does. So, MSVC and XCode users, please eupdate kdelibs, kdepimlibs and kdepim or kdebase and let me know if kdepim/kdebase still builds (links).
Alex
CCMAIL: ps_ml@gmx.de
CCMAIL: illogical1@gmail.com
CCMAIL: simon@etotheipiplusone.com
svn path=/trunk/KDE/kdelibs/; revision=892177
| -rw-r--r-- | modules/FindKdepimLibs.cmake | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/modules/FindKdepimLibs.cmake b/modules/FindKdepimLibs.cmake index d0ae4522..b5ef55f1 100644 --- a/modules/FindKdepimLibs.cmake +++ b/modules/FindKdepimLibs.cmake @@ -45,11 +45,12 @@ find_path( KDEPIMLIBS_INCLUDE_DIR NAMES kcal/kcal_export.h ) macro(_KDEPIMLibs_Set_Lib_Vars _prefix _lib) - set(KDEPIMLIBS_${_prefix}_LIBRARY ${_lib}) - set(KDEPIMLIBS_${_prefix}_LIBS ${_lib}) + # KDEPIMLIBS_TARGET_PREFIX exists since 03. Dec. and is empty before that, Alex + set(KDEPIMLIBS_${_prefix}_LIBRARY ${KDEPIMLIBS_TARGET_PREFIX}${_lib}) + set(KDEPIMLIBS_${_prefix}_LIBS ${KDEPIMLIBS_TARGET_PREFIX}${_lib}) # these two are set for compatibility with KDE 4.[01], Alex: - set(KDE4_${_prefix}_LIBRARY ${_lib}) - set(KDE4_${_prefix}_LIBS ${_lib}) + set(KDE4_${_prefix}_LIBRARY ${KDEPIMLIBS_TARGET_PREFIX}${_lib}) + set(KDE4_${_prefix}_LIBS ${KDEPIMLIBS_TARGET_PREFIX}${_lib}) endmacro(_KDEPIMLibs_Set_Lib_Vars) @@ -67,8 +68,12 @@ if( KDEPIMLIBS_INCLUDE_DIR ) if (NOT _newKdepimLibsFound) message(FATAL_ERROR "You need a newer version of kdepimlibs, please update it") endif (NOT _newKdepimLibsFound) - - include("${kdepimlibs_cmake_module_dir}/KDEPimLibsLibraryTargets.cmake") + + # this is for compatibility, starting next monday only the version with prefix will be installed, Alex + include("${kdepimlibs_cmake_module_dir}/KDEPimLibsLibraryTargetsWithPrefix.cmake" OPTIONAL RESULT_VARIABLE KDEPimLibsLibraryTargetsWithPrefix_LOADED) + if(NOT KDEPimLibsLibraryTargetsWithPrefix_LOADED) + include("${kdepimlibs_cmake_module_dir}/KDEPimLibsLibraryTargets.cmake") + endif(NOT KDEPimLibsLibraryTargetsWithPrefix_LOADED) _kdepimlibs_set_lib_vars( AKONADI akonadi-kde) _kdepimlibs_set_lib_vars( AKONADI_KMIME akonadi-kmime) |