From 0ea93fd3d34ab08fec748ae2f376a488e4e4e505 Mon Sep 17 00:00:00 2001 From: Andrea Scarpino Date: Mon, 17 Jun 2013 17:59:22 +0200 Subject: [PATCH] MacroLogFeature has been removed. See ECM_SouceIncompatChanges REVIEW:111074 --- src/plasma/CMakeLists.txt | 4 +++- src/plasma/staging/CMakeLists.txt | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt index 050325591..e7ed54d45 100644 --- a/src/plasma/CMakeLists.txt +++ b/src/plasma/CMakeLists.txt @@ -22,7 +22,9 @@ endif(NOT X11_FOUND) #find_package(KdepimLibs 4.5.60) #find_package(Gpgme) -#macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma DataEngines") +#set_package_properties(KDEPIMLIBS PROPERTIES DESCRIPTION "KDE PIM libraries" +# URL "http://www.kde.org" TYPE OPTIONAL +# PURPOSE "Needed for building several Plasma DataEngines") include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} diff --git a/src/plasma/staging/CMakeLists.txt b/src/plasma/staging/CMakeLists.txt index 1e1170898..6a5e9baa1 100644 --- a/src/plasma/staging/CMakeLists.txt +++ b/src/plasma/staging/CMakeLists.txt @@ -1,5 +1,7 @@ #FIXME: gpgme++ is in kdepimlibs, must move somewhere else! -macro_optional_find_package(KdepimLibs 4.5.60) -macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma DataEngines") +find_package(KdepimLibs 4.5.60) +set_package_properties(KDEPIMLIBS PROPERTIES DESCRIPTION "KDE PIM libraries" + URL "http://www.kde.org" TYPE OPTIONAL + PURPOSE "Needed for building several Plasma DataEngines") include_directories(${KDEPIMLIBS_INCLUDE_DIRS})