diff --git a/CMakeLists.txt b/CMakeLists.txt index c54c7ebe..e395ad42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ include(CheckIncludeFiles) include(CheckFunctionExists) include(GenerateExportHeader) -find_package(KDE4 4.19.0 REQUIRED) +find_package(KDE4 4.21.0 REQUIRED) include(KDE4Defaults) find_package(ZLIB) diff --git a/appveyor.yml b/appveyor.yml index 12a6a15b..85c7a522 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 4.20.0-{branch}-{build} +version: 4.21.0-{branch}-{build} image: Ubuntu2004 clone_depth: 1 cache: diff --git a/systemsettings/CMakeLists.txt b/systemsettings/CMakeLists.txt index c6dc3e69..e82812b2 100644 --- a/systemsettings/CMakeLists.txt +++ b/systemsettings/CMakeLists.txt @@ -1,13 +1,5 @@ PROJECT(systemsettings) -IF(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") - - FIND_PACKAGE(KDE4 REQUIRED) - INCLUDE(KDE4Defaults) - ADD_DEFINITIONS(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) - -ENDIF(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") - INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR}/core ${CMAKE_CURRENT_BINARY_DIR}/core