From f43667a6a11e6766d72a7a2432b683fb3aae6284 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 30 Oct 2018 14:23:48 +0100 Subject: [PATCH] Tests: Use TARGET over features to decide which tests to run Change-Id: I57642907c2e8e5e1424c5b70a905a2b26b93df88 Reviewed-by: Simon Hausmann --- tests/auto/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 5ee23c0023e..13728bd49bc 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -22,11 +22,11 @@ if (QT_FEATURE_dbus) add_subdirectory("dbus") endif() endif() -if (NOT APPLE_UIKIT AND QT_FEATURE_gui) +if (NOT APPLE_UIKIT AND TARGET Qt::Gui) add_subdirectory("gui") endif() -if (QT_FEATURE_network AND NOT WINRT) -# add_subdirectory("network") +if (TARGET Qt::Network AND NOT WINRT) + # add_subdirectory("network") endif() if (TARGET Qt::OpenGL AND NOT WINRT) add_subdirectory("opengl") @@ -38,17 +38,17 @@ add_subdirectory("testlib") if (NOT CMAKE_CROSSCOMPILE AND QT_FEATURE_process) # add_subdirectory("tools") endif() -if (QT_FEATURE_xml) +if (TARGET Qt::Xml) # add_subdirectory("xml") endif() -if (QT_FEATURE_concurrent) +if (TARGET Qt::Concurrent) # add_subdirectory("concurrent") endif() # add_subdirectory("other") -if (QT_FEATURE_widgets) +if (TARGET Qt::Widgets) add_subdirectory("widgets") endif() -if (QT_FEATURE_printsupport) +if (TARGET Qt::PrintSupport) # add_subdirectory("printsupport") endif() # add_subdirectory("cmake") ## FIXME: Does this still make sense in this form?