diff options
Diffstat (limited to 'cmake/QtProcessConfigureArgs.cmake')
| -rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 53235ee9d9..94bf5f4bff 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -90,7 +90,11 @@ unset(device_options) unset(options_json_file) set_property(GLOBAL PROPERTY UNHANDLED_ARGS "") while(NOT "${configure_args}" STREQUAL "") - list(POP_FRONT configure_args arg) + list(POP_FRONT configure_args raw_arg) + + # Condense '--foo-bar' arguments into '-foo-bar'. + string(REGEX REPLACE "^--([^-])" "-\\1" arg "${raw_arg}") + if(arg STREQUAL "-cmake-generator") list(POP_FRONT configure_args generator) elseif(arg STREQUAL "-cmake-use-default-generator") @@ -146,6 +150,8 @@ while(NOT "${configure_args}" STREQUAL "") elseif(arg STREQUAL "-no-prefix") set(no_prefix_option TRUE) push("-DFEATURE_no_prefix=ON") + elseif(arg STREQUAL "-sbom") + push("-DQT_GENERATE_SBOM=ON") elseif(arg STREQUAL "-cmake-file-api") set(cmake_file_api TRUE) elseif(arg STREQUAL "-no-cmake-file-api") @@ -156,7 +162,7 @@ while(NOT "${configure_args}" STREQUAL "") list(POP_FRONT configure_args version) is_valid_qt_hex_version("${arg}" "${version}") push("-DQT_DISABLE_DEPRECATED_UP_TO=${version}") - elseif(arg STREQUAL "--") + elseif(raw_arg STREQUAL "--") # Everything after this argument will be passed to CMake verbatim. list(APPEND cmake_args "${configure_args}") break() @@ -257,6 +263,11 @@ defstub(set_package_properties) defstub(qt_qml_find_python) defstub(qt_set01) defstub(qt_internal_check_if_linker_is_available) +defstub(qt_internal_add_sbom) +defstub(qt_internal_extend_sbom) +defstub(qt_internal_sbom_add_license) +defstub(qt_internal_extend_sbom_dependencies) +defstub(qt_find_package_extend_sbom) #################################################################################################### # Define functions/macros that are called in qt_cmdline.cmake files @@ -930,6 +941,7 @@ endforeach() translate_path_input(headerdir INSTALL_INCLUDEDIR) translate_path_input(plugindir INSTALL_PLUGINSDIR) translate_path_input(translationdir INSTALL_TRANSLATIONSDIR) +translate_path_input(sbomdir INSTALL_SBOMDIR) if(NOT "${INPUT_device}" STREQUAL "") push("-DQT_QMAKE_TARGET_MKSPEC=devices/${INPUT_device}") @@ -939,6 +951,7 @@ translate_string_input(platform QT_QMAKE_TARGET_MKSPEC) translate_string_input(xplatform QT_QMAKE_TARGET_MKSPEC) guess_compiler_from_mkspec() translate_string_input(qpa_default_platform QT_QPA_DEFAULT_PLATFORM) +translate_list_input(qpa_platforms QT_QPA_PLATFORMS) translate_path_input(android-sdk ANDROID_SDK_ROOT) translate_path_input(android-ndk ANDROID_NDK_ROOT) |