From 4f528dcdb30e07ba86a7c744bc2b45b22bec6f86 Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Fri, 8 Feb 2013 22:33:29 +0100 Subject: [PATCH] Load kconfig as a KF5 component (needed by current kdelibs) Alex --- CMakeLists.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d18ba74e..8b37ee712 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,16 +55,17 @@ set (QT_MIN_VERSION "5.0.0") find_package(kdeqt5staging REQUIRED NO_MODULE) -# Load CMake, Compiler and InstallDirs settings from KF5 and the following are already somewhat "done" tier1 libs from kdelibs: +# Load CMake, Compiler and InstallDirs settings from KF5 and the following are already somewhat "done" tier1/tier2 libs from kdelibs: find_package(KF5 MODULE REQUIRED CMake Compiler InstallDirs - kidletime itemmodels kwidgetsaddons kwindowsystem kcodecs karchive kcoreaddons solid) + kidletime itemmodels kwidgetsaddons kwindowsystem kcodecs karchive kcoreaddons solid + kconfig ) #find_package(KF5Transitional REQUIRED) # those are not "done" yet: find_package(ki18n REQUIRED NO_MODULE) find_package(kio REQUIRED NO_MODULE) -find_package(KDELibs4 NO_MODULE) +find_package(KDELibs4 REQUIRED NO_MODULE) find_package(kdeclarative REQUIRED NO_MODULE) @@ -148,9 +149,6 @@ endif() configure_file(config-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-prefix.h ) configure_file(config-compiler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-compiler.h ) -# Needed for the calls to kconfig_add_kcfg_files in some modules -set(KCONFIG_KCFGC_EXECUTABLE kconfig_compiler) - macro(installPackage dir component) set(root ${ARGN})