From bc1fb206bbff765310cbf2c122e3617c94efced0 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 14 Mar 2013 14:11:47 +0100 Subject: 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 Reviewed-by: Stephen Kelly --- tests/auto/cmake/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tests/auto/cmake/CMakeLists.txt') diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 4cc0505a8c..7be3116cbd 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -64,9 +64,7 @@ expect_fail(test_wrap_cpp_options) expect_pass(test_platform_defs_include) expect_pass(test_qtmainwin_library) -# If Qt D-Bus has been installed then run the tests for its macros. -find_package(Qt5DBus QUIET) -if (Qt5DBus_FOUND AND NOT APPLE) +if (NOT NO_DBUS) expect_pass(test_dbus_module) endif() expect_pass(test_multiple_find_package) @@ -110,7 +108,7 @@ if (NOT NO_WIDGETS) ) endif() -if (UNIX AND NOT APPLE AND NOT QNXNTO) +if (NOT NO_DBUS) list(APPEND qt_module_includes DBus QDBusMessage ) -- cgit v1.2.3