diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-03-12 10:42:25 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-13 09:48:58 +0100 |
commit | d89fe1c7b386db3335ade352d3b9d12953e20302 (patch) | |
tree | b6a71439f3b76b24c7cb4934c973ed58af0e4c69 | |
parent | 8cdcff460d0e185189b89b06a5285bf13774ab3e (diff) |
Test that the ConfigVersion.cmake files work.
Invoking find_package with a version but without the version
file present results in an error.
Change-Id: I29d662081ad5dbd7b2259abeec06affda97cbb6a
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
-rw-r--r-- | src/corelib/Qt5CTestMacros.cmake | 4 | ||||
-rw-r--r-- | tests/auto/cmake/test_concurrent_module/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/cmake/test_dbus_module/CMakeLists.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/Qt5CTestMacros.cmake b/src/corelib/Qt5CTestMacros.cmake index 60b98a7138..83f407ae12 100644 --- a/src/corelib/Qt5CTestMacros.cmake +++ b/src/corelib/Qt5CTestMacros.cmake @@ -80,7 +80,7 @@ function(test_module_includes) set(packages_string " ${packages_string} - find_package(Qt5${_package} REQUIRED) + find_package(Qt5${_package} 5.0.0 REQUIRED) " ) endforeach() @@ -90,7 +90,7 @@ function(test_module_includes) list(REMOVE_AT all_args 0 1) set(packages_string "${packages_string} - find_package(Qt5${qtmodule} REQUIRED) + find_package(Qt5${qtmodule} 5.0.0 REQUIRED) include_directories(\${Qt5${qtmodule}_INCLUDE_DIRS}) add_definitions(\${Qt5${qtmodule}_DEFINITIONS})\n" ) diff --git a/tests/auto/cmake/test_concurrent_module/CMakeLists.txt b/tests/auto/cmake/test_concurrent_module/CMakeLists.txt index efd7b725ea..7014fe51cd 100644 --- a/tests/auto/cmake/test_concurrent_module/CMakeLists.txt +++ b/tests/auto/cmake/test_concurrent_module/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8) project(test_concurrent_module) -find_package(Qt5Concurrent REQUIRED) +find_package(Qt5Concurrent 5.0.0 REQUIRED) include_directories( ${Qt5Concurrent_INCLUDE_DIRS} diff --git a/tests/auto/cmake/test_dbus_module/CMakeLists.txt b/tests/auto/cmake/test_dbus_module/CMakeLists.txt index 8c250ea778..36480e85e8 100644 --- a/tests/auto/cmake/test_dbus_module/CMakeLists.txt +++ b/tests/auto/cmake/test_dbus_module/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8) project(test_dbus_module) -find_package(Qt5DBus REQUIRED) +find_package(Qt5DBus 5.0.0 REQUIRED) include_directories( ${Qt5DBus_INCLUDE_DIRS} |