X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=CMakeLists.txt;h=09fc880b908c3c5458eba1e369e3dff54ab39c37;hb=949b3ad5833fb2f35459d04df2f596e07ccd3021;hp=66f355092df7b5c7c0883b2622591fa87cd7cc8a;hpb=f2d29da8b9f07ca88005763b955215fd18cc80cc;p=kde%2Fkde-extraapps.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66f35509..09fc880b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,9 @@
 project(kde-extraapps)
 
-find_package(KDE4 4.18.0 REQUIRED)
-include(KDE4Defaults)
 include(GenerateExportHeader)
+include(FeatureSummary)
 
-set(LIBRARY_TYPE SHARED)
+find_package(KDELibs4 4.23.0 REQUIRED)
 
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 
@@ -13,63 +12,24 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${KDE4_INCLUDES}
-    ${CMAKE_CURRENT_BINARY_DIR}/syndication
 )
 
-find_package(Boost)
-set_package_properties(Boost PROPERTIES
-    DESCRIPTION "Free peer-reviewed portable C++ source libraries"
-    URL "https://www.boost.org/"
-    TYPE RECOMMENDED
-    PURPOSE "Required to build libktorrent, akregator and syndication"
-)
-
-macro_optional_add_subdirectory(about-distro)
-macro_optional_add_subdirectory(ark)
-macro_optional_add_subdirectory(bluedevil)
-macro_optional_add_subdirectory(dragon)
-macro_optional_add_subdirectory(ffmpegthumbs)
-macro_optional_add_subdirectory(filelight)
-macro_optional_add_subdirectory(gwenview)
-macro_optional_add_subdirectory(jovie)
-macro_optional_add_subdirectory(kcalc)
-macro_optional_add_subdirectory(kcron)
-macro_optional_add_subdirectory(kdenetwork-filesharing)
-macro_optional_add_subdirectory(kdeplasma-addons)
-macro_optional_add_subdirectory(kfilemetadata)
-macro_optional_add_subdirectory(lokalize)
-macro_optional_add_subdirectory(libksane)
-macro_optional_add_subdirectory(kcolorchooser)
-macro_optional_add_subdirectory(kfloppy)
-macro_optional_add_subdirectory(kget)
-macro_optional_add_subdirectory(kgpg)
-macro_optional_add_subdirectory(kmix)
-macro_optional_add_subdirectory(kompare)
-macro_optional_add_subdirectory(krdc)
-macro_optional_add_subdirectory(krfb)
-macro_optional_add_subdirectory(ksaneplugin)
-macro_optional_add_subdirectory(ksnapshot)
-macro_optional_add_subdirectory(ksystemlog)
-macro_optional_add_subdirectory(ktimer)
-macro_optional_add_subdirectory(kuassel)
-macro_optional_add_subdirectory(kuser)
-macro_optional_add_subdirectory(kvkbd)
-macro_optional_add_subdirectory(okular)
-macro_optional_add_subdirectory(partitionmanager)
-macro_optional_add_subdirectory(print-manager)
-macro_optional_add_subdirectory(skanlite)
-macro_optional_add_subdirectory(svgpart)
-macro_optional_add_subdirectory(thumbnailers)
-macro_optional_add_subdirectory(yakuake)
-
-# include directories for projects that require boost
-if(Boost_FOUND)
-    include_directories(${Boost_INCLUDE_DIRS})
-else()
-    include_directories(AFTER ${CMAKE_SOURCE_DIR}/miniboost)
-endif()
-macro_optional_add_subdirectory(libktorrent)
-macro_optional_add_subdirectory(akregator)
-macro_optional_add_subdirectory(syndication)
-
-macro_display_feature_log()
+kde4_optional_add_subdirectory(about-distro)
+kde4_optional_add_subdirectory(ark)
+kde4_optional_add_subdirectory(filelight)
+kde4_optional_add_subdirectory(gwenview)
+kde4_optional_add_subdirectory(kcalc)
+kde4_optional_add_subdirectory(kcolorchooser)
+kde4_optional_add_subdirectory(kdeplasma-addons)
+kde4_optional_add_subdirectory(kemu)
+kde4_optional_add_subdirectory(kget)
+kde4_optional_add_subdirectory(kmix)
+kde4_optional_add_subdirectory(krdc)
+kde4_optional_add_subdirectory(krfb)
+kde4_optional_add_subdirectory(ksnapshot)
+kde4_optional_add_subdirectory(kvkbd)
+kde4_optional_add_subdirectory(okular)
+kde4_optional_add_subdirectory(partitionmanager)
+kde4_optional_add_subdirectory(thumbnailers)
+
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)