diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2023-09-21 08:48:53 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2023-09-21 21:46:46 +0200 |
| commit | 814de4c2ce8a4a9198672c68d64a2eb9c8e30e8b (patch) | |
| tree | 168719819de98b868145547d9d30d5df9279d523 /tests/auto/cmake | |
| parent | 49ff83fcef270c2a4317b5c95524c08a26120074 (diff) | |
CMake: Fix config condition evaluator
Use recursive descent to handle parentheses in config condition
expressions. This fixes cases like 'NOT (A AND B)'.
Fixes: QTBUG-117053
Change-Id: Iab1b6173abe00d763808bb972a9a5443ffa0938d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
Diffstat (limited to 'tests/auto/cmake')
| -rw-r--r-- | tests/auto/cmake/test_config_expressions/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/cmake/test_config_expressions/CMakeLists.txt b/tests/auto/cmake/test_config_expressions/CMakeLists.txt index 4061728113..e3863b738a 100644 --- a/tests/auto/cmake/test_config_expressions/CMakeLists.txt +++ b/tests/auto/cmake/test_config_expressions/CMakeLists.txt @@ -88,9 +88,9 @@ assert_F(A AND B) assert_T(A AND (B OR C)) assert_T((A AND B) OR C) assert_T((A AND B) OR (NOT B AND C)) -expect_failure_F(NOT (B OR C)) # QTBUG-117053 -expect_failure_T(NOT (A AND B)) # QTBUG-117053 -expect_failure_F(NOT (B OR C)) # QTBUG-117053 +assert_F(NOT (B OR C)) +assert_T(NOT (A AND B)) +assert_F(NOT (B OR C)) # target check set(lib1_cpp "${CMAKE_CURRENT_BINARY_DIR}/lib1.cpp") |