diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-08-21 15:10:46 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-08-23 11:04:51 +0200 |
| commit | 97551b90b974f943ff3fac40314c79ef922596d3 (patch) | |
| tree | 12d6d08f813a63f1e1de2e364fee4eb247515d27 /cmake/QtFeature.cmake | |
| parent | 7e7c9ba45554cd4c2f9a80ad61c3d2a0f9599f9b (diff) | |
CMake: Actually evaluate AUTODETECT expressions in features
Very simple AUTODETECT expressions worked fine, but expressions with
parentheses, for example, were not correctly evaluated.
Change-Id: Ibec4fa55474e149a701f861838fdea41d31beca0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtFeature.cmake')
| -rw-r--r-- | cmake/QtFeature.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake index 66242548ed..8d22235d4d 100644 --- a/cmake/QtFeature.cmake +++ b/cmake/QtFeature.cmake @@ -253,9 +253,10 @@ function(qt_evaluate_feature feature) qt_evaluate_config_expression(disable_result ${arg_DISABLE}) qt_evaluate_config_expression(enable_result ${arg_ENABLE}) + qt_evaluate_config_expression(auto_detect ${arg_AUTODETECT}) if(${disable_result}) set(result OFF) - elseif((${enable_result}) OR (${arg_AUTODETECT})) + elseif((${enable_result}) OR (${auto_detect})) set(result ${condition}) else() # feature not auto-detected and not explicitly enabled |