diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-08-13 14:34:40 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-08-17 08:08:26 +0200 |
| commit | f107713452e9eae83df1e70fa7af78a63c54f98f (patch) | |
| tree | 8a0767de2cd0d6f0995c6aff735abb2b1c63767c /cmake | |
| parent | 584d4be174c6ac8cd0f3395c3852bfe1516f09a5 (diff) | |
CMake: De-duplicate list input handling code in QtProcessConfigureArgs
Change-Id: I9fd77dd81f67fcc9a0306ab0d627257f209cdb08
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index ed6e9800ea..3ae289eb27 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -517,6 +517,14 @@ macro(translate_path_input name cmake_var) endif() endmacro() +macro(translate_list_input name cmake_var) + if(DEFINED INPUT_${name}) + list(JOIN INPUT_${name} "\\;" value) + list(APPEND cmake_args "-D${cmake_var}=${value}") + drop_input(${name}) + endif() +endmacro() + foreach(feature ${commandline_known_features}) qt_feature_normalize_name("${feature}" cmake_feature) translate_boolean_input(${feature} FEATURE_${cmake_feature}) @@ -590,19 +598,8 @@ elseif(nr_of_build_configs GREATER 1) list(APPEND cmake_args "-DCMAKE_CONFIGURATION_TYPES=${escaped_build_configs}") endif() -drop_input(device-option) -if(INPUT_device-option) - unset(escaped_device_options) - list(JOIN INPUT_device-option "\\;" escaped_device_options) - list(APPEND cmake_args "-DQT_QMAKE_DEVICE_OPTIONS=${escaped_device_options}") -endif() - -drop_input(rpaths) -if(INPUT_rpaths) - unset(escaped_paths) - list(JOIN INPUT_rpaths "\\;" escaped_paths) - list(APPEND cmake_args "-DQT_EXTRA_RPATHS=${escaped_paths}") -endif() +translate_list_input(device-option QT_QMAKE_DEVICE_OPTIONS) +translate_list_input(rpaths QT_EXTRA_RPATHS) foreach(input ${config_inputs}) push("-DINPUT_${input}=${INPUT_${input}}") |