From ae64c54f8cc2491988241a7433f5e8cfc6016ab4 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 3 May 2024 09:10:55 +0200 Subject: [PATCH] configure: Fix --developer-build argument (with two hyphens) We never properly handled double-hyphen arguments like --list-features. However --developer-build worked by accident, because it did set INPUT_developer_build implicitly. Now, we don't automagically translate INPUT_foo to FEATURE_foo anymore, and --developer-build stopped working. Fix this by consistently handling -foo and --foo arguments. Change-Id: Ibf32979b419c28e0a8e1f810f03ae3f295b14c69 Reviewed-by: Alexey Edelev --- cmake/QtProcessConfigureArgs.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 53235ee9d98..c64403b2094 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") @@ -156,7 +160,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()