From 08fe73fbac73d6f79944ff1cf910ef698ce07eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Fri, 3 Dec 2021 17:00:08 +0100 Subject: [PATCH] Tests: Use REQUIRED COMPONENTS in find_package(Qt6...) Make sure configure fails early if a component cannot be found. Task-number: QTBUG-98867 Change-Id: I4baa35a84342df58ce8932601fb602be92ed5ab9 Reviewed-by: Alexandru Croitor (cherry picked from commit 9ca7429dff4b5d46114ca36147f65b61d5e61290) Reviewed-by: Qt Cherry-pick Bot --- .../serialization/qcborstreamreader/next/CMakeLists.txt | 2 +- .../corelib/serialization/qcborvalue/fromcbor/CMakeLists.txt | 2 +- .../qtextstream/extractionoperator-float/CMakeLists.txt | 2 +- .../qxmlstream/qxmlstreamreader/readnext/CMakeLists.txt | 2 +- .../corelib/text/qregularexpression/optimize/CMakeLists.txt | 2 +- .../corelib/time/qdatetime/fromstring/CMakeLists.txt | 2 +- .../corelib/tools/qcryptographichash/result/CMakeLists.txt | 2 +- tests/libfuzzer/gui/image/qimage/loadfromdata/CMakeLists.txt | 3 +-- .../gui/painting/qcolorspace/fromiccprofile/CMakeLists.txt | 3 +-- tests/libfuzzer/gui/text/qtextdocument/sethtml/CMakeLists.txt | 3 +-- .../gui/text/qtextdocument/setmarkdown/CMakeLists.txt | 3 +-- .../libfuzzer/gui/text/qtextlayout/beginlayout/CMakeLists.txt | 3 +-- .../ssl/qsslcertificate/qsslcertificate/pem/CMakeLists.txt | 3 +-- tests/manual/highdpi/dprgadget/CMakeLists.txt | 4 +--- tests/manual/highdpi/pixelgadget/CMakeLists.txt | 4 +--- tests/manual/highdpi/screengadget/CMakeLists.txt | 4 +--- 16 files changed, 16 insertions(+), 28 deletions(-) diff --git a/tests/libfuzzer/corelib/serialization/qcborstreamreader/next/CMakeLists.txt b/tests/libfuzzer/corelib/serialization/qcborstreamreader/next/CMakeLists.txt index 7858cdaf031..98d43b4d73a 100644 --- a/tests/libfuzzer/corelib/serialization/qcborstreamreader/next/CMakeLists.txt +++ b/tests/libfuzzer/corelib/serialization/qcborstreamreader/next/CMakeLists.txt @@ -7,7 +7,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -find_package(Qt6 COMPONENTS Core) +find_package(Qt6 REQUIRED COMPONENTS Core) qt_add_executable(next main.cpp diff --git a/tests/libfuzzer/corelib/serialization/qcborvalue/fromcbor/CMakeLists.txt b/tests/libfuzzer/corelib/serialization/qcborvalue/fromcbor/CMakeLists.txt index 1da0a21f5aa..735a9ff9eba 100644 --- a/tests/libfuzzer/corelib/serialization/qcborvalue/fromcbor/CMakeLists.txt +++ b/tests/libfuzzer/corelib/serialization/qcborvalue/fromcbor/CMakeLists.txt @@ -7,7 +7,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -find_package(Qt6 COMPONENTS Core) +find_package(Qt6 REQUIRED COMPONENTS Core) qt_add_executable(fromcbor main.cpp diff --git a/tests/libfuzzer/corelib/serialization/qtextstream/extractionoperator-float/CMakeLists.txt b/tests/libfuzzer/corelib/serialization/qtextstream/extractionoperator-float/CMakeLists.txt index 72cfd09277f..57cc0ce3d1b 100644 --- a/tests/libfuzzer/corelib/serialization/qtextstream/extractionoperator-float/CMakeLists.txt +++ b/tests/libfuzzer/corelib/serialization/qtextstream/extractionoperator-float/CMakeLists.txt @@ -7,7 +7,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -find_package(Qt6 COMPONENTS Core) +find_package(Qt6 REQUIRED COMPONENTS Core) qt_add_executable(extractionoperator-float main.cpp diff --git a/tests/libfuzzer/corelib/serialization/qxmlstream/qxmlstreamreader/readnext/CMakeLists.txt b/tests/libfuzzer/corelib/serialization/qxmlstream/qxmlstreamreader/readnext/CMakeLists.txt index 79c88970b33..f9de2536544 100644 --- a/tests/libfuzzer/corelib/serialization/qxmlstream/qxmlstreamreader/readnext/CMakeLists.txt +++ b/tests/libfuzzer/corelib/serialization/qxmlstream/qxmlstreamreader/readnext/CMakeLists.txt @@ -7,7 +7,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -find_package(Qt6 COMPONENTS Core) +find_package(Qt6 REQUIRED COMPONENTS Core) qt_add_executable(readnext main.cpp diff --git a/tests/libfuzzer/corelib/text/qregularexpression/optimize/CMakeLists.txt b/tests/libfuzzer/corelib/text/qregularexpression/optimize/CMakeLists.txt index d31e48188a8..782e00dc3bb 100644 --- a/tests/libfuzzer/corelib/text/qregularexpression/optimize/CMakeLists.txt +++ b/tests/libfuzzer/corelib/text/qregularexpression/optimize/CMakeLists.txt @@ -7,7 +7,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -find_package(Qt6 COMPONENTS Core) +find_package(Qt6 REQUIRED COMPONENTS Core) qt_add_executable(optimize main.cpp diff --git a/tests/libfuzzer/corelib/time/qdatetime/fromstring/CMakeLists.txt b/tests/libfuzzer/corelib/time/qdatetime/fromstring/CMakeLists.txt index adec286291b..6c0000092af 100644 --- a/tests/libfuzzer/corelib/time/qdatetime/fromstring/CMakeLists.txt +++ b/tests/libfuzzer/corelib/time/qdatetime/fromstring/CMakeLists.txt @@ -7,7 +7,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -find_package(Qt6 COMPONENTS Core) +find_package(Qt6 REQUIRED COMPONENTS Core) qt_add_executable(fromstring main.cpp diff --git a/tests/libfuzzer/corelib/tools/qcryptographichash/result/CMakeLists.txt b/tests/libfuzzer/corelib/tools/qcryptographichash/result/CMakeLists.txt index 1e4ebc9b75d..4b71c78873d 100644 --- a/tests/libfuzzer/corelib/tools/qcryptographichash/result/CMakeLists.txt +++ b/tests/libfuzzer/corelib/tools/qcryptographichash/result/CMakeLists.txt @@ -7,7 +7,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -find_package(Qt6 COMPONENTS Core) +find_package(Qt6 REQUIRED COMPONENTS Core) qt_add_executable(result main.cpp diff --git a/tests/libfuzzer/gui/image/qimage/loadfromdata/CMakeLists.txt b/tests/libfuzzer/gui/image/qimage/loadfromdata/CMakeLists.txt index afc695b722f..0355db4b1b6 100644 --- a/tests/libfuzzer/gui/image/qimage/loadfromdata/CMakeLists.txt +++ b/tests/libfuzzer/gui/image/qimage/loadfromdata/CMakeLists.txt @@ -7,8 +7,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 REQUIRED COMPONENTS Core Gui) qt_add_executable(loadfromdata main.cpp diff --git a/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/CMakeLists.txt b/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/CMakeLists.txt index 5ca99fc305d..9c77939a2aa 100644 --- a/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/CMakeLists.txt +++ b/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/CMakeLists.txt @@ -7,8 +7,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 REQUIRED COMPONENTS Core Gui) qt_add_executable(fromiccprofile main.cpp diff --git a/tests/libfuzzer/gui/text/qtextdocument/sethtml/CMakeLists.txt b/tests/libfuzzer/gui/text/qtextdocument/sethtml/CMakeLists.txt index fd502c9972a..7540b437904 100644 --- a/tests/libfuzzer/gui/text/qtextdocument/sethtml/CMakeLists.txt +++ b/tests/libfuzzer/gui/text/qtextdocument/sethtml/CMakeLists.txt @@ -7,8 +7,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 REQUIRED COMPONENTS Core Gui) qt_add_executable(sethtml main.cpp diff --git a/tests/libfuzzer/gui/text/qtextdocument/setmarkdown/CMakeLists.txt b/tests/libfuzzer/gui/text/qtextdocument/setmarkdown/CMakeLists.txt index 0e24a66f0c4..22b24ab06f6 100644 --- a/tests/libfuzzer/gui/text/qtextdocument/setmarkdown/CMakeLists.txt +++ b/tests/libfuzzer/gui/text/qtextdocument/setmarkdown/CMakeLists.txt @@ -7,8 +7,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 REQUIRED COMPONENTS Core Gui) qt_add_executable(setmarkdown main.cpp diff --git a/tests/libfuzzer/gui/text/qtextlayout/beginlayout/CMakeLists.txt b/tests/libfuzzer/gui/text/qtextlayout/beginlayout/CMakeLists.txt index eb51b36c69b..e542ece7038 100644 --- a/tests/libfuzzer/gui/text/qtextlayout/beginlayout/CMakeLists.txt +++ b/tests/libfuzzer/gui/text/qtextlayout/beginlayout/CMakeLists.txt @@ -7,8 +7,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 REQUIRED COMPONENTS Core Gui) qt_add_executable(beginlayout main.cpp diff --git a/tests/libfuzzer/network/ssl/qsslcertificate/qsslcertificate/pem/CMakeLists.txt b/tests/libfuzzer/network/ssl/qsslcertificate/qsslcertificate/pem/CMakeLists.txt index c10aad68452..dbb1840eadf 100644 --- a/tests/libfuzzer/network/ssl/qsslcertificate/qsslcertificate/pem/CMakeLists.txt +++ b/tests/libfuzzer/network/ssl/qsslcertificate/qsslcertificate/pem/CMakeLists.txt @@ -7,8 +7,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Network) +find_package(Qt6 REQUIRED COMPONENTS Core Network) qt_add_executable(pem main.cpp diff --git a/tests/manual/highdpi/dprgadget/CMakeLists.txt b/tests/manual/highdpi/dprgadget/CMakeLists.txt index 6ed9aaf3256..a8d52f03d87 100644 --- a/tests/manual/highdpi/dprgadget/CMakeLists.txt +++ b/tests/manual/highdpi/dprgadget/CMakeLists.txt @@ -3,9 +3,7 @@ cmake_minimum_required(VERSION 3.16) project(dprgadget LANGUAGES CXX) set(CMAKE_AUTOMOC ON) -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_add_executable(dprgadget main.cpp diff --git a/tests/manual/highdpi/pixelgadget/CMakeLists.txt b/tests/manual/highdpi/pixelgadget/CMakeLists.txt index 888ce95a8e9..ac2013af0ed 100644 --- a/tests/manual/highdpi/pixelgadget/CMakeLists.txt +++ b/tests/manual/highdpi/pixelgadget/CMakeLists.txt @@ -3,9 +3,7 @@ cmake_minimum_required(VERSION 3.16) project(pixelgadget LANGUAGES CXX) set(CMAKE_AUTOMOC ON) -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_add_executable(pixelgadget main.cpp diff --git a/tests/manual/highdpi/screengadget/CMakeLists.txt b/tests/manual/highdpi/screengadget/CMakeLists.txt index 97442e50a4a..0b3c3dbc30a 100644 --- a/tests/manual/highdpi/screengadget/CMakeLists.txt +++ b/tests/manual/highdpi/screengadget/CMakeLists.txt @@ -3,9 +3,7 @@ cmake_minimum_required(VERSION 3.16) project(screengadget LANGUAGES CXX) set(CMAKE_AUTOMOC ON) -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_add_executable(screengadget main.cpp