From 608e1dc8232002bc4cff600eae7571a100856334 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 14 May 2021 12:38:57 +0200 Subject: [PATCH] Use BUILD_TESTING to make tests optional Variable is provided by KDECMakeSettings and default enabled. Signed-off-by: Andreas Sturmlechner --- CMakeLists.txt | 6 +++++- libdiscover/CMakeLists.txt | 4 +++- libdiscover/backends/DummyBackend/CMakeLists.txt | 4 +++- libdiscover/backends/FlatpakBackend/CMakeLists.txt | 4 +++- libdiscover/backends/KNSBackend/CMakeLists.txt | 4 +++- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cd8c61aa..8ce3fa8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,11 @@ include(ECMQtDeclareLoggingCategory) include(KDEClangFormat) include(KDEGitCommitHooks) -find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick) +find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network Xml Concurrent DBus Quick) + +if(BUILD_TESTING) + find_package(Qt${QT_MAJOR_VERSION}Test ${QT_MIN_VERSION} CONFIG REQUIRED) +endif() find_package(PkgConfig REQUIRED) diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt index a26d6934..ca827f3b 100644 --- a/libdiscover/CMakeLists.txt +++ b/libdiscover/CMakeLists.txt @@ -4,7 +4,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-paths.h.cmake ${CMAKE_CURRENT_ add_subdirectory(backends) add_subdirectory(notifiers) -add_subdirectory(tests) +if(BUILD_TESTING) + add_subdirectory(tests) +endif() set(discovercommon_SRCS Category/Category.cpp diff --git a/libdiscover/backends/DummyBackend/CMakeLists.txt b/libdiscover/backends/DummyBackend/CMakeLists.txt index 5b4aef10..38377d80 100644 --- a/libdiscover/backends/DummyBackend/CMakeLists.txt +++ b/libdiscover/backends/DummyBackend/CMakeLists.txt @@ -1,4 +1,6 @@ -add_subdirectory(tests) +if(BUILD_TESTING) + add_subdirectory(tests) +endif() set(dummy-backend_SRCS DummyResource.cpp diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt index 55e6b38e..e2d11b93 100644 --- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt +++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt @@ -1,4 +1,6 @@ -add_subdirectory(tests) +if(BUILD_TESTING) + add_subdirectory(tests) +endif() set(flatpak-backend_SRCS FlatpakResource.cpp diff --git a/libdiscover/backends/KNSBackend/CMakeLists.txt b/libdiscover/backends/KNSBackend/CMakeLists.txt index 54f19e1f..ec3443e9 100644 --- a/libdiscover/backends/KNSBackend/CMakeLists.txt +++ b/libdiscover/backends/KNSBackend/CMakeLists.txt @@ -1,4 +1,6 @@ -add_subdirectory(tests) +if(BUILD_TESTING) + add_subdirectory(tests) +endif() add_library(kns-backend MODULE KNSBackend.cpp -- 2.35.1