From de349a576481ed05756e90d7022ddf0d1aaf49b7 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 26 Feb 2013 14:02:06 +0100 Subject: Use qmake for package dependency resolution in cmake tests. This allows us to remove hardcoded depends information. Change-Id: I5aac8d8e4fe53ad335ab4317c2bca82e9b6e4ede Reviewed-by: Oswald Buddenhagen --- tests/auto/cmake/CMakeLists.txt | 2 -- tests/auto/cmake/cmake.pro | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index fda4e5e..b869eaa 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -9,8 +9,6 @@ find_package(Qt5Core REQUIRED) include("${_Qt5CTestMacros}") -set(Qt5_MODULE_TEST_DEPENDS Network) - test_module_includes( XmlPatterns QXmlQuery ) diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro index bf2dbcb..d69a54f 100644 --- a/tests/auto/cmake/cmake.pro +++ b/tests/auto/cmake/cmake.pro @@ -2,4 +2,6 @@ # Cause make to do nothing. TEMPLATE = subdirs +CMAKE_QT_MODULES_UNDER_TEST = xmlpatterns + CONFIG += ctest_testcase -- cgit v1.2.1