AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: De-duplicate list input handling code in QtProcessConfigureArgs

Browse Source 
Change-Id: I9fd77dd81f67fcc9a0306ab0d627257f209cdb08
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-08-13 14:34:40 +02:00
parent 584d4be174
commit f107713452
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cmake/QtProcessConfigureArgs.cmake
View File

@ -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}}")