summaryrefslogtreecommitdiffstats
path: root/cmake/tests
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2018-11-14 14:24:34 +0100
committerTobias Hunger <tobias.hunger@qt.io>2018-11-22 08:39:15 +0000
commitfac800ad1c5355e9002bf819ae06923a4edaf572 (patch)
treeb52d5637499df573566f446ee3d67bc072938ecd /cmake/tests
parentf37ce9ab84400a45752787b9e015a7919c8771bd (diff)
CMake: Fix cmake test for features
Features are now always defined (to OFF) when they are not emitted. Adapt the test for that. Change-Id: Id5f662f07fea15c22027b9b00d1b53a288b4a0dc Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'cmake/tests')
-rw-r--r--cmake/tests/features/CMakeLists.txt2
-rw-r--r--cmake/tests/features/src/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/tests/features/CMakeLists.txt b/cmake/tests/features/CMakeLists.txt
index 7b76a4529f..e255b209c9 100644
--- a/cmake/tests/features/CMakeLists.txt
+++ b/cmake/tests/features/CMakeLists.txt
@@ -28,7 +28,7 @@ assert(QT_FEATURE_top_b STREQUAL "OFF")
assert(QT_FEATURE_top_enabled STREQUAL "ON")
assert(QT_FEATURE_top_disabled STREQUAL "OFF")
assert(QT_FEATURE_top_disabled_enabled STREQUAL "OFF")
-assert(NOT DEFINED QT_FEATURE_top_not_emitted)
+assert(QT_FEATURE_top_not_emitted STREQUAL "OFF")
## Enable feature summary at the end of the configure run:
include(FeatureSummary)
diff --git a/cmake/tests/features/src/CMakeLists.txt b/cmake/tests/features/src/CMakeLists.txt
index 1a31dbc8c5..bfb02be07d 100644
--- a/cmake/tests/features/src/CMakeLists.txt
+++ b/cmake/tests/features/src/CMakeLists.txt
@@ -4,4 +4,4 @@ assert(QT_FEATURE_top_b STREQUAL "OFF")
assert(QT_FEATURE_top_enabled STREQUAL "ON")
assert(QT_FEATURE_top_disabled STREQUAL "OFF")
assert(QT_FEATURE_top_disabled_enabled STREQUAL "OFF")
-assert(NOT DEFINED QT_FEATURE_top_not_emitted)
+assert(QT_FEATURE_top_not_emitted STREQUAL "OFF")