diff options
| author | Stephen Kelly <ske@ableton.com> | 2016-01-18 10:55:49 +0100 |
|---|---|---|
| committer | Stephen Kelly <ske@ableton.com> | 2016-01-18 13:00:03 +0000 |
| commit | 99e25dd7d8bfcb184852110c5f882b89cfb889df (patch) | |
| tree | 35651e51c40092b5354dbfe0d445e3c12bffb576 | |
| parent | f634ce3b9a38b163a6ef4d57d6bd61745d5248c9 (diff) | |
CMake: Don't attempt gui-tests if Qt is built with -no-gui
Change-Id: I5f327fa1b0c7827535a4b00ca7d0d4281b1eec7b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| -rw-r--r-- | mkspecs/features/ctest_testcase_common.prf | 1 | ||||
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/features/ctest_testcase_common.prf b/mkspecs/features/ctest_testcase_common.prf index bdf40541ec..7183ade4df 100644 --- a/mkspecs/features/ctest_testcase_common.prf +++ b/mkspecs/features/ctest_testcase_common.prf @@ -56,6 +56,7 @@ mingw:isEmpty(CROSS_COMPILE):CMAKE_GENERATOR = -G \"MinGW Makefiles\" BUILD_DIR = $$replace($$list($$OUT_PWD/build), /, $$QMAKE_DIR_SEP) +!qtHaveModule(gui): CMAKE_MODULE_DEFINES += -DNO_GUI=True !qtHaveModule(widgets): CMAKE_MODULE_DEFINES += -DNO_WIDGETS=True !qtHaveModule(dbus): CMAKE_MODULE_DEFINES += -DNO_DBUS=True diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 3a607983f9..5248f75a84 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -50,7 +50,9 @@ include("${_Qt5CTestMacros}") if(NOT ${CMAKE_VERSION} VERSION_LESS 2.8.9) # Requires INCLUDE_DIRECTORIES target property in CMake 2.8.8 # and POSITION_INDEPENDENT_CODE target property in 2.8.9 - expect_pass(test_use_modules_function) + if (NOT NO_GUI) + expect_pass(test_use_modules_function) + endif() expect_pass(test_umbrella_config) else() message("CMake version older than 2.8.9 (Found ${CMAKE_VERSION}). Not running test \"test_use_modules_function\" or \"test_umbrella_config\"") |