From 1bca6c3dfa880d54036debf30f839e4a12bf5ac2 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Thu, 17 Apr 2014 06:26:01 +1000 Subject: [PATCH] Disable testing if QtTest is not found. REVIEW: 117393 --- CMakeLists.txt | 24 +++++++++++++++++------- kcmkwin/kwincompositing/CMakeLists.txt | 1 + 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9228e8199..2334ffc22e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,23 +14,33 @@ include(GenerateExportHeader) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -include(KDEInstallDirs) -include(KDECMakeSettings) -include(KDECompilerSettings) - -include(ECMInstallIcons) - find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Concurrent Core DBus Quick Script - Test UiTools Widgets X11Extras ) + +find_package(Qt5Test ${QT_MIN_VERSION} CONFIG QUIET) +set_package_properties(Qt5Test PROPERTIES + PURPOSE "Required for tests" + TYPE OPTIONAL + ) +add_feature_info("Qt5Test" Qt5Test_FOUND "Required for building tests") +if (NOT Qt5Test_FOUND) + set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.") +endif() + +include(KDEInstallDirs) +include(KDECMakeSettings) +include(KDECompilerSettings) + +include(ECMInstallIcons) + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) find_package(Qt5Multimedia QUIET) diff --git a/kcmkwin/kwincompositing/CMakeLists.txt b/kcmkwin/kwincompositing/CMakeLists.txt index 8eb170bedd..86b97bbc0f 100644 --- a/kcmkwin/kwincompositing/CMakeLists.txt +++ b/kcmkwin/kwincompositing/CMakeLists.txt @@ -52,6 +52,7 @@ qt5_add_dbus_interface( modelTest_SRC ${KWIN_SOURCE_DIR}/org.kde.kwin.Effects.xml kwin_effects_interface) add_executable(effectModelTest ${modelTest_SRC}) +ecm_mark_as_test(effectModelTest) target_link_libraries(effectModelTest Qt5::Quick