diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-26 15:16:30 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-29 12:24:40 +0200 |
| commit | 1f3af0f35c16b3d125f494b60290a867375217d8 (patch) | |
| tree | d67a4c2cbaf44363bb7d4a81235a399298975cc4 /cmake | |
| parent | 375831a3dcf2f8862723a45ecf292da305db198b (diff) | |
CMake: Fix double-negation of feature CONFIG values
The plugin-manifests feature has the "negative" CONFIG value
"no_plugin_manifest". On negation, we're supposed to strip off the
leading "no_" instead of adding another one.
Change-Id: Id2c66da41f22881272d5b923f12b85d9fcc2c9d0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtFeature.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake index 6a26824bd4..c0e1313a45 100644 --- a/cmake/QtFeature.cmake +++ b/cmake/QtFeature.cmake @@ -320,7 +320,11 @@ function(qt_evaluate_qmake_config_values key) set(expected "NOT") if (arg_NEGATE) set(expected "") - string(PREPEND arg_NAME "no_") + if(arg_NAME MATCHES "^no_(.*)") + set(arg_NAME "${CMAKE_MATCH_1}") + else() + string(PREPEND arg_NAME "no_") + endif() endif() # The feature condition is false, there is no need to export any config values. |