From 91cd2009bd446091c90c79ecf29e29db8768956e Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 12 Mar 2013 10:38:22 +0100 Subject: [PATCH] Generate a Qt5ConfigVersion.cmake file. This allows finding a minimum particular version of Qt 5. Change-Id: I96112f1be90f397ec60a2b233989ac0e0380bef9 Reviewed-by: Alexander Neundorf Reviewed-by: Stephen Kelly --- src/corelib/corelib.pro | 7 +++++-- .../test_umbrella_config/components_found/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index b1f1a60b6c1..3b7eb11229b 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -72,10 +72,13 @@ ctest_macros_file.CONFIG = verbatim cmake_umbrella_config_file.input = $$PWD/Qt5Config.cmake.in cmake_umbrella_config_file.output = $$DESTDIR/cmake/Qt5/Qt5Config.cmake -cmake_qt5_umbrella_module_files.files = $$cmake_umbrella_config_file.output +cmake_umbrella_config_version_file.input = $$PWD/../../mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in +cmake_umbrella_config_version_file.output = $$DESTDIR/cmake/Qt5/Qt5ConfigVersion.cmake + +cmake_qt5_umbrella_module_files.files = $$cmake_umbrella_config_file.output $$cmake_umbrella_config_version_file.output cmake_qt5_umbrella_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5 -QMAKE_SUBSTITUTES += ctest_macros_file cmake_umbrella_config_file +QMAKE_SUBSTITUTES += ctest_macros_file cmake_umbrella_config_file cmake_umbrella_config_version_file ctest_qt5_module_files.files += $$ctest_macros_file.output diff --git a/tests/auto/cmake/test_umbrella_config/components_found/CMakeLists.txt b/tests/auto/cmake/test_umbrella_config/components_found/CMakeLists.txt index 91cb623deb9..2099e36068d 100644 --- a/tests/auto/cmake/test_umbrella_config/components_found/CMakeLists.txt +++ b/tests/auto/cmake/test_umbrella_config/components_found/CMakeLists.txt @@ -1,6 +1,6 @@ # The module finds its dependencies -find_package(Qt5 +find_package(Qt5 5.1.0 COMPONENTS Core OPTIONAL_COMPONENTS DoesNotExist )