summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2013-03-14 14:11:47 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-19 11:26:41 +0100
commitbc1fb206bbff765310cbf2c122e3617c94efced0 (patch)
tree67983aab4735dd4567eae21bfad4827fa7f6ccad /src
parent9bf5870eb9a4e4449eda731029db5af2bcea39a3 (diff)
Run CMake dbus tests if dbus is expected to be available.
Instead of first finding it and then testing that we can find it. Change-Id: I1a1090693520b1d6adadef93839f25d277947e76 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/Qt5CTestMacros.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/Qt5CTestMacros.cmake b/src/corelib/Qt5CTestMacros.cmake
index 5d0dc60607..b313cd5c08 100644
--- a/src/corelib/Qt5CTestMacros.cmake
+++ b/src/corelib/Qt5CTestMacros.cmake
@@ -22,6 +22,9 @@ endif()
if (NO_WIDGETS)
list(APPEND BUILD_OPTIONS_LIST "-DNO_WIDGETS=True")
endif()
+if (NO_DBUS)
+ list(APPEND BUILD_OPTIONS_LIST "-DNO_DBUS=True")
+endif()
macro(expect_pass _dir)
string(REPLACE "(" "_" testname "${_dir}")