From 854bdc6a16fc3ff98c537e87b5fea8f90c67b96c Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Mon, 30 Aug 2021 17:41:27 +0200 Subject: Simplify test examples target includes Fix condition to include examples and tests based on targets. We are no longer behind external project so we can simply check for targets. Fix issue for including automoc call when running qt configure when doing top level build. Task-number: QTBUG-95590 Change-Id: I0cd2d8016e14ddf296455277e968b43a923a7217 Reviewed-by: Allan Sandfeld Jensen (cherry picked from commit faa74f9b402f6b5d78acdb71b05ca340684b3591) Reviewed-by: Qt Cherry-pick Bot --- examples/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'examples') 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() -- cgit v1.2.3