diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2023-05-12 12:56:36 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2023-05-22 14:20:33 +0200 |
| commit | 2dff3b3666f9dff0dee23df225cd241a76b74bb9 (patch) | |
| tree | 30e6cbc4fbaf8a67e73a0d2e89f5b537f3db116f | |
| parent | 3a8cbb678e509937db881316942250c67cfd59ba (diff) | |
Add mising cmake function
Provide missing cmake function in case
webengine is compiled with older qt.
Change-Id: I4d7d09d15d50f3f6b539fa3077d7bb880045a6b5
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | cmake/Functions.cmake | 9 | ||||
| -rw-r--r-- | src/host/CMakeLists.txt | 5 |
3 files changed, 17 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1011fcfb6..fbe69c154 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,10 @@ project(QtWebEngine HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C ) -qt_internal_project_setup() + +if(COMMAND qt_internal_project_setup) + qt_internal_project_setup() +endif() find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS Gui Widgets Network OpenGL Quick Qml PrintSupport diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index e28126653..f3c836432 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -1,6 +1,15 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause +# this macro is missing in 6.2 +if(NOT COMMAND _qt_internal_validate_all_args_are_parsed) + macro(_qt_internal_validate_all_args_are_parsed result) + if(DEFINED ${result}_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Unknown arguments (${${result}_UNPARSED_ARGUMENTS}).") + endif() + endmacro() +endif() + function(assertTargets) cmake_parse_arguments(PARSE_ARGV 0 arg "" "" "MODULES;TARGETS" diff --git a/src/host/CMakeLists.txt b/src/host/CMakeLists.txt index 08da14c1d..0b4238821 100644 --- a/src/host/CMakeLists.txt +++ b/src/host/CMakeLists.txt @@ -20,7 +20,10 @@ project(QtWebEngineConfigure LANGUAGES CXX C) find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) -qt_internal_project_setup() + +if(COMMAND qt_internal_project_setup) + qt_internal_project_setup() +endif() set(buildDir ${CMAKE_CURRENT_BINARY_DIR}) configure_gn_toolchain(host ${TEST_architecture_arch} ${TEST_architecture_arch} |