diff options
author | Alexey Edelev <alexey.edelev@qt.io> | 2020-11-03 14:08:26 +0100 |
---|---|---|
committer | Alexey Edelev <alexey.edelev@qt.io> | 2020-11-03 16:28:14 +0100 |
commit | dc43061e9abb15bc07eb236f5344c79d27590812 (patch) | |
tree | cce3c881724bed0666b3080d4a8209d2d6c57e95 /cmake/QtProcessConfigureArgs.cmake | |
parent | f8c30759d98603908b408464ea6d98413fc81eec (diff) |
CMake: Add handling of user-defined INPUT_foo cache variables
"configure" script translates feature-related parameters to INPUT_
variables instead of FEATURE_.
Both INPUT_ and FEATURE_ variables passed to cmake script are
equivalent. FEATURE_ has higher priority in case if both are defined.
Fixes: QTBUG-87755
Change-Id: If697a0d62ab839877a3196ea74e631582a570dda
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtProcessConfigureArgs.cmake')
-rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 734384bc5e..6871d560ed 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -705,7 +705,7 @@ translate_list_input(rpaths QT_EXTRA_RPATHS) foreach(feature ${commandline_known_features}) qt_feature_normalize_name("${feature}" cmake_feature) if(${feature} IN_LIST config_inputs) - translate_boolean_input(${feature} FEATURE_${cmake_feature}) + translate_boolean_input(${feature} INPUT_${cmake_feature}) endif() endforeach() |