diff options
author | Rolf Eike Beer <eb@emlix.com> | 2022-09-02 09:12:48 +0200 |
---|---|---|
committer | Rolf Eike Beer <eb@emlix.com> | 2022-09-07 18:34:35 +0200 |
commit | 00af5037d983d8e6e0b3a9c73bb2ef9ea700fa78 (patch) | |
tree | 5360533c3834801f67246dc5f8753a75f7f15d66 | |
parent | 06567dc6ec4bc2a400c34ec286fac48f84b5ce9e (diff) | |
download | qtbase-00af5037d983d8e6e0b3a9c73bb2ef9ea700fa78.tar.gz |
CMake: allow user specified boolean values to have any case
When running something like this:
cmake -D FEATURE_xkbcommon=On qtbase
one would run into issues like:
CMake Error at cmake/QtFeature.cmake:254 (message):
Sanity check failed: FEATURE_xkbcommon has invalid value "On"!
Call Stack (most recent call first):
cmake/QtFeature.cmake:396 (qt_feature_check_and_save_user_provided_value)
cmake/QtFeature.cmake:606 (qt_evaluate_feature)
cmake/QtFeature.cmake:575 (qt_feature_module_end)
src/CMakeLists.txt:12 (qt_feature_evaluate_features)
Change-Id: I33a921625b97aeb3c423cb7c1fb1bd3b05ce24a7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 60829b0b257e62056aa32a7e58863b2c30bbdc89)
-rw-r--r-- | cmake/QtFeature.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake index c30ef7f11c..6af7610b74 100644 --- a/cmake/QtFeature.cmake +++ b/cmake/QtFeature.cmake @@ -236,7 +236,7 @@ function(qt_feature_check_and_save_user_provided_value resultVar feature conditi if (DEFINED "FEATURE_${feature}") # Revisit new user provided value set(user_value "${FEATURE_${feature}}") - set(result "${user_value}") + string(TOUPPER "${user_value}" result) # If the build is marked as dirty and the user_value doesn't meet the new condition, # reset it to the computed one. |