diff options
| -rw-r--r-- | examples/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tests/auto/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | tests/auto/httpserver/httpserver.cmake | 6 |
3 files changed, 12 insertions, 16 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 54e8d5006..e17626721 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -2,16 +2,16 @@ cmake_minimum_required(VERSION 3.16) qt_examples_build_begin() if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533 - if(QT_FEATURE_qtwebengine_build AND QT_FEATURE_qtwebengine_quick_build) + if(TARGET Qt::WebEngineCore) add_subdirectory(webengine) endif() - if(QT_FEATURE_qtwebengine_build AND QT_FEATURE_qtwebengine_widgets_build) + if(TARGET Qt::WebEngineWidgets) add_subdirectory(webenginewidgets) endif() - if(QT_FEATURE_qtpdf_build AND QT_FEATURE_qtpdf_quick_build) + if(TARGET Qt::Pdf) add_subdirectory(pdf) endif() - if(QT_FEATURE_qtpdf_build AND QT_FEATURE_qtpdf_widgets_build) + if(TARGET Qt::PdfWidgets) add_subdirectory(pdfwidgets) endif() endif() diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 1e5c1f6bd..e000203d9 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -1,18 +1,14 @@ -if(QT_FEATURE_qtwebengine_build - OR (QT_BUILD_STANDALONE_TESTS AND TARGET Qt::WebEngineCore)) - add_subdirectory(core) +if(TARGET Qt::WebEngineCore) add_subdirectory(httpserver) add_subdirectory(util) + add_subdirectory(core) endif() -if(QT_FEATURE_qtwebengine_quick_build - OR (QT_BUILD_STANDALONE_TESTS AND TARGET Qt::WebEngineQuick)) +if(TARGET Qt::WebEngineQuick) add_subdirectory(quick) endif() -if(QT_FEATURE_qtwebengine_widgets_build - OR (QT_BUILD_STANDALONE_TESTS AND TARGET Qt::WebEngineWidgets)) +if(TARGET Qt::WebEngineWidgets) add_subdirectory(widgets) endif() -if(QT_FEATURE_qtpdf_build - OR (QT_BUILD_STANDALONE_TESTS AND TARGET Qt::Pdf)) +if(TARGET Qt::Pdf) add_subdirectory(pdf) endif() diff --git a/tests/auto/httpserver/httpserver.cmake b/tests/auto/httpserver/httpserver.cmake index e10c52b76..d67648f9c 100644 --- a/tests/auto/httpserver/httpserver.cmake +++ b/tests/auto/httpserver/httpserver.cmake @@ -1,8 +1,8 @@ if (NOT TARGET Test::HttpServer) - set(CMAKE_AUTOMOC ON) - set(CMAKE_AUTORCC ON) - set(CMAKE_AUTOUIC ON) + if(NOT QT_SUPERBUILD AND NOT QT_CONFIGURE_RUNNING) + set(CMAKE_AUTOMOC ON) + endif() add_library(httpserver STATIC ${CMAKE_CURRENT_LIST_DIR}/httpreqrep.cpp |