diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2024-01-04 11:18:14 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2024-02-13 20:11:21 +0100 |
| commit | 55d81b3eff1ef44a071b9bb91d6ba01b0bda8fe9 (patch) | |
| tree | 2055eb9ed57bb9177df33d7b6675af31d0f7a376 /cmake/QtFeature.cmake | |
| parent | be009c6857dc75c0bdf789c4ac9323f0cf1fd9e6 (diff) | |
CMake: Remove qt_internal_compute_features_from_possible_inputs
This function calculated the values of the features 'no-prefix' and
'developer-build' from INPUT_* values. Since configure directly
translates -no-prefix and -developer-build to FEATURE_no_prefix and
FEATURE_developer_build, we can remove the function.
Task-number: QTBUG-120529
Change-Id: Ide1fa61af175d8f6a6aa6363dfdfa94912836345
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtFeature.cmake')
| -rw-r--r-- | cmake/QtFeature.cmake | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake index 46f39da887..3aac7aaa24 100644 --- a/cmake/QtFeature.cmake +++ b/cmake/QtFeature.cmake @@ -414,8 +414,6 @@ function(qt_evaluate_feature feature) qt_evaluate_config_expression(emit_if ${arg_EMIT_IF}) endif() - qt_internal_compute_feature_value_from_possible_input("${feature}") - # Warn about a feature which is not emitted, but the user explicitly provided a value for it. if(NOT emit_if AND DEFINED FEATURE_${feature}) set(msg "") @@ -879,8 +877,6 @@ function(qt_internal_detect_dirty_features) message(STATUS "Checking for feature set changes") set_property(GLOBAL PROPERTY _qt_feature_clean TRUE) foreach(feature ${QT_KNOWN_FEATURES}) - qt_internal_compute_feature_value_from_possible_input("${feature}") - if(DEFINED "FEATURE_${feature}" AND NOT "${QT_FEATURE_${feature}}" STREQUAL "${FEATURE_${feature}}") message(" '${feature}' was changed from ${QT_FEATURE_${feature}} " @@ -915,18 +911,6 @@ function(qt_internal_detect_dirty_features) endif() endfunction() -macro(qt_internal_compute_features_from_possible_inputs) - # Pre-calculate the developer_build feature if it's set by the user via the I - # NPUT_developer_build variable when using the configure script. When not using configure, don't - # take the INPUT variable into account, so that users can toggle the feature directly in the - # cache or via IDE. - qt_internal_compute_feature_value_from_possible_input(developer_build) - - # Pre-calculate the no_prefix feature if it's set by configure via INPUT_no_prefix. - # This needs to be done before qtbase/configure.cmake is processed. - qt_internal_compute_feature_value_from_possible_input(no_prefix) -endmacro() - function(qt_config_compile_test name) if(DEFINED "TEST_${name}") return() |