Load kconfig as a KF5 component (needed by current kdelibs)

Alex
This commit is contained in:
Alex Neundorf 2013-02-08 22:33:29 +01:00
parent 9ee93a0661
commit 4f528dcdb3

View File

@ -55,16 +55,17 @@ set (QT_MIN_VERSION "5.0.0")
find_package(kdeqt5staging REQUIRED NO_MODULE) 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 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) #find_package(KF5Transitional REQUIRED)
# those are not "done" yet: # those are not "done" yet:
find_package(ki18n REQUIRED NO_MODULE) find_package(ki18n REQUIRED NO_MODULE)
find_package(kio 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) 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-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-prefix.h )
configure_file(config-compiler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-compiler.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) macro(installPackage dir component)
set(root ${ARGN}) set(root ${ARGN})