Git commit 92acd71c769d46d479152356783e21a03bda25e2 by Stephen Kelly. Committed on 27/08/2013 at 17:14. Pushed by skelly into branch 'frameworks'.
Find Qt dependendency in tier1 frameworks. This way, find_package(KArchive REQUIRED) now works and is enough to be able to use the KF5::KArchive target. Note: You need to update your ECM after this commit. CCMAIL: kde-frameworks-devel@kde.org M +2 -1 tier1/itemmodels/CMakeLists.txt M +2 -0 tier1/itemmodels/ItemModelsConfig.cmake.in M +2 -1 tier1/karchive/CMakeLists.txt M +2 -0 tier1/karchive/KArchiveConfig.cmake.in M +2 -1 tier1/kcodecs/CMakeLists.txt M +2 -0 tier1/kcodecs/KCodecsConfig.cmake.in M +2 -1 tier1/kcoreaddons/CMakeLists.txt M +1 -1 tier1/kcoreaddons/KCoreAddonsConfig.cmake.in M +2 -1 tier1/kdbusaddons/CMakeLists.txt M +2 -0 tier1/kdbusaddons/KDBusAddonsConfig.cmake.in M +3 -2 tier1/kidletime/CMakeLists.txt M +2 -0 tier1/kidletime/KIdleTimeConfig.cmake.in M +2 -1 tier1/kjs/CMakeLists.txt M +2 -0 tier1/kjs/KJSConfig.cmake.in M +2 -1 tier1/kplotting/CMakeLists.txt M +2 -0 tier1/kplotting/KPlottingConfig.cmake.in M +2 -2 tier1/kwidgetsaddons/CMakeLists.txt M +2 -0 tier1/kwidgetsaddons/KWidgetsAddonsConfig.cmake.in M +3 -2 tier1/kwindowsystem/CMakeLists.txt M +2 -0 tier1/kwindowsystem/KWindowSystemConfig.cmake.in M +2 -1 tier1/solid/CMakeLists.txt M +2 -0 tier1/solid/SolidConfig.cmake.in M +2 -1 tier1/sonnet/CMakeLists.txt M +2 -0 tier1/sonnet/SonnetConfig.cmake.in M +2 -1 tier1/threadweaver/CMakeLists.txt M +2 -0 tier1/threadweaver/ThreadWeaverConfig.cmake.in http://commits.kde.org/kdelibs/92acd71c769d46d479152356783e21a03bda25e2 diff --git a/tier1/itemmodels/CMakeLists.txt b/tier1/itemmodels/CMakeLists.txt index 71d533b0..8985869 100644 --- a/tier1/itemmodels/CMakeLists.txt +++ b/tier1/itemmodels/CMakeLists.txt @@ -8,7 +8,8 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) find_package(KF5 5.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDirs) -find_package(Qt5Core 5.2.0 REQUIRED NO_MODULE) +set(REQUIRED_QT_VERSION 5.2.0) +find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) include(FeatureSummary) diff --git a/tier1/itemmodels/ItemModelsConfig.cmake.in b/tier1/itemmodels/ItemModelsConfig.cmake.in index a7f85de..1fce82c 100644 --- a/tier1/itemmodels/ItemModelsConfig.cmake.in +++ b/tier1/itemmodels/ItemModelsConfig.cmake.in @@ -1,5 +1,7 @@ @PACKAGE_INIT@ +find_dependency(Qt5Core @REQUIRED_QT_VERSION@) + set(ItemModels_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") set_and_check(ItemModels_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") diff --git a/tier1/karchive/CMakeLists.txt b/tier1/karchive/CMakeLists.txt index 112174b..cfdee5c 100644 --- a/tier1/karchive/CMakeLists.txt +++ b/tier1/karchive/CMakeLists.txt @@ -10,7 +10,8 @@ find_package(KF5 5.0.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDirs) include(FeatureSummary) -find_package(Qt5Test 5.2.0 REQUIRED NO_MODULE) +set(REQUIRED_QT_VERSION 5.2.0) +find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(ZLIB) set_package_properties(ZLIB PROPERTIES diff --git a/tier1/karchive/KArchiveConfig.cmake.in b/tier1/karchive/KArchiveConfig.cmake.in index 3d49829..ef24541 100644 --- a/tier1/karchive/KArchiveConfig.cmake.in +++ b/tier1/karchive/KArchiveConfig.cmake.in @@ -1,5 +1,7 @@ @PACKAGE_INIT@ +find_dependency(Qt5Core @REQUIRED_QT_VERSION@) + set(KArchive_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") set_and_check(KArchive_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") diff --git a/tier1/kcodecs/CMakeLists.txt b/tier1/kcodecs/CMakeLists.txt index 331803d..fdc2dbb 100644 --- a/tier1/kcodecs/CMakeLists.txt +++ b/tier1/kcodecs/CMakeLists.txt @@ -8,7 +8,8 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ) find_package(KF5 5.0.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDirs) -find_package(Qt5Test 5.2.0 REQUIRED NO_MODULE) +set(REQUIRED_QT_VERSION 5.2.0) +find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) include(FeatureSummary) include(CMakePackageConfigHelpers) diff --git a/tier1/kcodecs/KCodecsConfig.cmake.in b/tier1/kcodecs/KCodecsConfig.cmake.in index 5548506..955b0d4 100644 --- a/tier1/kcodecs/KCodecsConfig.cmake.in +++ b/tier1/kcodecs/KCodecsConfig.cmake.in @@ -1,5 +1,7 @@ @PACKAGE_INIT@ +find_dependency(Qt5Core @REQUIRED_QT_VERSION@) + set(KCodecs_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") set_and_check(KCodecs_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") diff --git a/tier1/kcoreaddons/CMakeLists.txt b/tier1/kcoreaddons/CMakeLists.txt index 0e52b9e..3385301 100644 --- a/tier1/kcoreaddons/CMakeLists.txt +++ b/tier1/kcoreaddons/CMakeLists.txt @@ -12,7 +12,8 @@ include(ECMSetupVersion) find_package(KF5 5.0.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDirs) -find_package(Qt5 5.2.0 REQUIRED NO_MODULE COMPONENTS Test Concurrent) +set(REQUIRED_QT_VERSION 5.2.0) +find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Test Concurrent) # Configure checks for kdirwatch find_package(FAM) diff --git a/tier1/kcoreaddons/KCoreAddonsConfig.cmake.in b/tier1/kcoreaddons/KCoreAddonsConfig.cmake.in index dc612c7..c07f3e9 100644 --- a/tier1/kcoreaddons/KCoreAddonsConfig.cmake.in +++ b/tier1/kcoreaddons/KCoreAddonsConfig.cmake.in @@ -1,6 +1,6 @@ @PACKAGE_INIT@ -# Any changes in this file will be overwritten by CMake. +find_dependency(Qt5Core @REQUIRED_QT_VERSION@) set(KCoreAddons_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") set_and_check(KCoreAddons_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") diff --git a/tier1/kdbusaddons/CMakeLists.txt b/tier1/kdbusaddons/CMakeLists.txt index 7678ee9..3fbf2e9 100644 --- a/tier1/kdbusaddons/CMakeLists.txt +++ b/tier1/kdbusaddons/CMakeLists.txt @@ -8,7 +8,8 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) find_package(KF5 5.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDirs) -find_package(Qt5DBus 5.2.0 REQUIRED NO_MODULE) +set(REQUIRED_QT_VERSION 5.2.0) +find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) include(FeatureSummary) include(CMakePackageConfigHelpers) diff --git a/tier1/kdbusaddons/KDBusAddonsConfig.cmake.in b/tier1/kdbusaddons/KDBusAddonsConfig.cmake.in index 74b0220..0572203 100644 --- a/tier1/kdbusaddons/KDBusAddonsConfig.cmake.in +++ b/tier1/kdbusaddons/KDBusAddonsConfig.cmake.in @@ -1,5 +1,7 @@ @PACKAGE_INIT@ +find_dependency(Qt5DBus @REQUIRED_QT_VERSION@) + set(KDBusAddons_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") set_and_check(KDBusAddons_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") diff --git a/tier1/kidletime/CMakeLists.txt b/tier1/kidletime/CMakeLists.txt index c7cc60e..a18b199 100644 --- a/tier1/kidletime/CMakeLists.txt +++ b/tier1/kidletime/CMakeLists.txt @@ -8,10 +8,11 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) find_package(KF5 5.0.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDirs) -find_package(Qt5 5.2.0 REQUIRED NO_MODULE COMPONENTS Widgets DBus) +set(REQUIRED_QT_VERSION 5.2.0) +find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets DBus) if(NOT WIN32) - find_package(Qt5 5.2.0 REQUIRED NO_MODULE COMPONENTS X11Extras) + find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS X11Extras) endif(NOT WIN32) include(FeatureSummary) diff --git a/tier1/kidletime/KIdleTimeConfig.cmake.in b/tier1/kidletime/KIdleTimeConfig.cmake.in index 76f1f22..26f7694 100644 --- a/tier1/kidletime/KIdleTimeConfig.cmake.in +++ b/tier1/kidletime/KIdleTimeConfig.cmake.in @@ -1,5 +1,7 @@ @PACKAGE_INIT@ +find_dependency(Qt5Core @REQUIRED_QT_VERSION@) + set(KIdleTime_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") set_and_check(KIdleTime_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") diff --git a/tier1/kjs/CMakeLists.txt b/tier1/kjs/CMakeLists.txt index 7900fb9..f678464 100644 --- a/tier1/kjs/CMakeLists.txt +++ b/tier1/kjs/CMakeLists.txt @@ -8,7 +8,8 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) find_package(KF5 5.0.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDirs) -find_package(Qt5 5.2.0 REQUIRED NO_MODULE COMPONENTS Test Widgets) +set(REQUIRED_QT_VERSION 5.2.0) +find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Test Widgets) include(FeatureSummary) include(CMakePackageConfigHelpers) diff --git a/tier1/kjs/KJSConfig.cmake.in b/tier1/kjs/KJSConfig.cmake.in index 9859d86..c10756f 100644 --- a/tier1/kjs/KJSConfig.cmake.in +++ b/tier1/kjs/KJSConfig.cmake.in @@ -1,5 +1,7 @@ @PACKAGE_INIT@ +find_dependency(Qt5Core @REQUIRED_QT_VERSION@) + set(KJS_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") set_and_check(KJS_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") diff --git a/tier1/kplotting/CMakeLists.txt b/tier1/kplotting/CMakeLists.txt index 88a91a2..53a3c71 100644 --- a/tier1/kplotting/CMakeLists.txt +++ b/tier1/kplotting/CMakeLists.txt @@ -8,7 +8,8 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) find_package(KF5 5.0.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDirs) -find_package(Qt5Widgets 5.2.0 REQUIRED NO_MODULE) +set(REQUIRED_QT_VERSION 5.2.0) +find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) include(FeatureSummary) include(CMakePackageConfigHelpers) diff --git a/tier1/kplotting/KPlottingConfig.cmake.in b/tier1/kplotting/KPlottingConfig.cmake.in index 317691a..62f57d9 100644 --- a/tier1/kplotting/KPlottingConfig.cmake.in +++ b/tier1/kplotting/KPlottingConfig.cmake.in @@ -1,5 +1,7 @@ @PACKAGE_INIT@ +find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) + set(KPlotting_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") set_and_check(KPlotting_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") diff --git a/tier1/kwidgetsaddons/CMakeLists.txt b/tier1/kwidgetsaddons/CMakeLists.txt index e555af3..eb0a32a 100644 --- a/tier1/kwidgetsaddons/CMakeLists.txt +++ b/tier1/kwidgetsaddons/CMakeLists.txt @@ -7,8 +7,8 @@ find_package(ECM 0.0.8 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) find_package(KF5 5.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDirs) - -find_package(Qt5Widgets 5.2.0 REQUIRED NO_MODULE) +set(REQUIRED_QT_VERSION 5.2.0) +find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) include(FeatureSummary) include(CMakePackageConfigHelpers) diff --git a/tier1/kwidgetsaddons/KWidgetsAddonsConfig.cmake.in b/tier1/kwidgetsaddons/KWidgetsAddonsConfig.cmake.in index c7c00f4..7bedbfb 100644 --- a/tier1/kwidgetsaddons/KWidgetsAddonsConfig.cmake.in +++ b/tier1/kwidgetsaddons/KWidgetsAddonsConfig.cmake.in @@ -1,5 +1,7 @@ @PACKAGE_INIT@ +find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) + set(KWidgetsAddons_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") set_and_check(KWidgetsAddons_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") diff --git a/tier1/kwindowsystem/CMakeLists.txt b/tier1/kwindowsystem/CMakeLists.txt index 5deb912..3db68d5 100644 --- a/tier1/kwindowsystem/CMakeLists.txt +++ b/tier1/kwindowsystem/CMakeLists.txt @@ -8,10 +8,11 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) find_package(KF5 5.0.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDirs) -find_package(Qt5 5.2.0 REQUIRED NO_MODULE COMPONENTS Widgets Test DBus) +set(REQUIRED_QT_VERSION 5.2.0) +find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Test DBus) if(NOT WIN32) - find_package(Qt5 5.2.0 REQUIRED NO_MODULE COMPONENTS X11Extras) + find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS X11Extras) endif(NOT WIN32) include(FeatureSummary) diff --git a/tier1/kwindowsystem/KWindowSystemConfig.cmake.in b/tier1/kwindowsystem/KWindowSystemConfig.cmake.in index 9d9cec02..d505f07 100644 --- a/tier1/kwindowsystem/KWindowSystemConfig.cmake.in +++ b/tier1/kwindowsystem/KWindowSystemConfig.cmake.in @@ -1,5 +1,7 @@ @PACKAGE_INIT@ +find_dependency(Qt5Core @REQUIRED_QT_VERSION@) + set(KWindowSystem_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") set_and_check(KWindowSystem_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") diff --git a/tier1/solid/CMakeLists.txt b/tier1/solid/CMakeLists.txt index e142836..0486db2 100644 --- a/tier1/solid/CMakeLists.txt +++ b/tier1/solid/CMakeLists.txt @@ -9,7 +9,8 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) find_package(KF5 5.0.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDirs) -find_package(Qt5 5.2.0 REQUIRED NO_MODULE COMPONENTS Xml Concurrent DBus Widgets Test) +set(REQUIRED_QT_VERSION 5.2.0) +find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Xml Concurrent DBus Widgets Test) include(FeatureSummary) include(CMakePackageConfigHelpers) diff --git a/tier1/solid/SolidConfig.cmake.in b/tier1/solid/SolidConfig.cmake.in index 73c5518..7f9fb3f 100644 --- a/tier1/solid/SolidConfig.cmake.in +++ b/tier1/solid/SolidConfig.cmake.in @@ -18,6 +18,8 @@ @PACKAGE_INIT@ +find_dependency(Qt5Core @REQUIRED_QT_VERSION@) + set(Solid_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") set_and_check(Solid_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") diff --git a/tier1/sonnet/CMakeLists.txt b/tier1/sonnet/CMakeLists.txt index bdd3903..07935a6 100644 --- a/tier1/sonnet/CMakeLists.txt +++ b/tier1/sonnet/CMakeLists.txt @@ -17,7 +17,8 @@ remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) remove_definitions(-DQT_USE_FAST_CONCATENATION) remove_definitions(-DQT_USE_FAST_OPERATOR_PLUS) -find_package(Qt5 5.2.0 REQUIRED NO_MODULE COMPONENTS DBus Widgets Test) +set(REQUIRED_QT_VERSION 5.2.0) +find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS DBus Widgets Test) include(FeatureSummary) diff --git a/tier1/sonnet/SonnetConfig.cmake.in b/tier1/sonnet/SonnetConfig.cmake.in index 0bf8013..c0650f3 100644 --- a/tier1/sonnet/SonnetConfig.cmake.in +++ b/tier1/sonnet/SonnetConfig.cmake.in @@ -1,5 +1,7 @@ @PACKAGE_INIT@ +find_dependency(Qt5Core @REQUIRED_QT_VERSION@) + set(Sonnet_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") set_and_check(Sonnet_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") diff --git a/tier1/threadweaver/CMakeLists.txt b/tier1/threadweaver/CMakeLists.txt index 851d756..b6a7260 100644 --- a/tier1/threadweaver/CMakeLists.txt +++ b/tier1/threadweaver/CMakeLists.txt @@ -9,7 +9,8 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) find_package(KF5 5.0.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDirs) -find_package(Qt5Test 5.2.0 REQUIRED NO_MODULE) +set(REQUIRED_QT_VERSION 5.2.0) +find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) include(FeatureSummary) diff --git a/tier1/threadweaver/ThreadWeaverConfig.cmake.in b/tier1/threadweaver/ThreadWeaverConfig.cmake.in index c7e5742..f53db28 100644 --- a/tier1/threadweaver/ThreadWeaverConfig.cmake.in +++ b/tier1/threadweaver/ThreadWeaverConfig.cmake.in @@ -1,5 +1,7 @@ @PACKAGE_INIT@ +find_dependency(Qt5Core @REQUIRED_QT_VERSION@) + set(ThreadWeaver_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") set_and_check(ThreadWeaver_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") _______________________________________________ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
