From 14492ecee2e34843efd3ef070503a43a48552055 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 9 Mar 2020 13:53:53 +0100 Subject: CMake: Regenerate and adapt to merge from dev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If8daa6152a563d4309d7342414780ef75b9f5589 Reviewed-by: Tor Arne Vestbø Reviewed-by: Leander Beernaert --- tests/auto/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/CMakeLists.txt') diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 106a7fe10e..702f646bd4 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -4,17 +4,17 @@ add_subdirectory(qml) add_subdirectory(quick) add_subdirectory(quicktest) add_subdirectory(qmldevtools) -# add_subdirectory(cmake) # special case remove # special case begin +# add_subdirectory(cmake) # add_subdirectory(installed_cmake) # special case end add_subdirectory(toolsupport) if(NOT APPLE_UIKIT) add_subdirectory(qmltest) endif() -if(QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 OR (QT_FEATURE_opengl AND TARGET Qt::Gui)) +if(TARGET Qt::Gui AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)) add_subdirectory(particles) endif() -if(QT_FEATURE_opengles2 OR (QT_FEATURE_opengl AND TARGET Qt::Gui) OR (QT_FEATURE_opengles3 AND TARGET Qt::Widgets)) +if(TARGET Qt::Gui AND TARGET Qt::Widgets AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)) add_subdirectory(quickwidgets) endif() -- cgit v1.2.3