From 9723c3606ae6bebdbdf7c9e85a75bc297aeef7e3 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sat, 13 Mar 2021 15:18:38 +0100
Subject: [PATCH] Remove BUILD_TESTS cmake option

---
 CMakeLists.txt       | 20 ++++++++++++--------
 tests/CMakeLists.txt | 11 -----------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 479f4272..00409177 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,6 +134,8 @@ pkg_check_modules(LIBMTP libmtp>=1.0)
 pkg_check_modules(GDK_PIXBUF gdk-pixbuf-2.0)
 find_package(Gettext)
 find_package(FFTW3)
+find_package(GTest)
+find_library(GMOCK_LIBRARY gmock)
 
 if(NOT QT_DEFAULT_MAJOR_VERSION)
   set(QT_DEFAULT_MAJOR_VERSION 5)
@@ -163,7 +165,7 @@ else()
 endif()
 
 set(QT_COMPONENTS Core Concurrent Widgets Network Sql)
-unset(OPTIONAL_COMPONENTS)
+set(QT_OPTIONAL_COMPONENTS Test)
 
 if(QT_MAJOR_VERSION EQUAL 5)
   set(QT_MIN_VERSION 5.8)
@@ -173,13 +175,13 @@ if(DBUS_FOUND AND NOT WIN32)
   list(APPEND QT_COMPONENTS DBus)
 endif()
 if(X11_FOUND)
-  list(APPEND OPTIONAL_COMPONENTS X11Extras)
+  list(APPEND QT_OPTIONAL_COMPONENTS X11Extras)
 endif()
 if(WIN32)
-  list(APPEND OPTIONAL_COMPONENTS WinExtras)
+  list(APPEND QT_OPTIONAL_COMPONENTS WinExtras)
 endif()
 
-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS} OPTIONAL_COMPONENTS ${OPTIONAL_COMPONENTS})
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS} OPTIONAL_COMPONENTS ${QT_OPTIONAL_COMPONENTS})
 
 set(QtCore_LIBRARIES Qt${QT_MAJOR_VERSION}::Core)
 set(QtConcurrent_LIBRARIES Qt${QT_MAJOR_VERSION}::Concurrent)
@@ -203,6 +205,10 @@ if(Qt${QT_MAJOR_VERSION}WinExtras_FOUND)
   list(APPEND QT_LIBRARIES Qt${QT_MAJOR_VERSION}::WinExtras)
   set(HAVE_WINEXTRAS ON)
 endif()
+if(Qt${QT_MAJOR_VERSION}Test_FOUND)
+  set(QtTest_LIBRARIES Qt${QT_MAJOR_VERSION}::Test)
+  list(APPEND QT_LIBRARIES ${QtTest_LIBRARIES})
+endif()
 
 find_package(Qt${QT_MAJOR_VERSION} QUIET COMPONENTS LinguistTools CONFIG)
 if(Qt${QT_MAJOR_VERSION}LinguistTools_FOUND)
@@ -426,11 +432,9 @@ if(HAVE_MOODBAR)
   add_subdirectory(ext/gstmoodbar)
 endif()
 
-option(BUILD_TESTS "Build the test suite" OFF)
-
-if(BUILD_TESTS)
+if(GTest_FOUND AND GMOCK_LIBRARY AND QtTest_LIBRARIES)
   add_subdirectory(tests)
-endif(BUILD_TESTS)
+endif()
 
 # Uninstall support
 configure_file(
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d8bd2552..875115b2 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,16 +1,5 @@
 enable_testing()
 
-if(BUILD_WITH_QT6)
-  find_package(Qt6 COMPONENTS Test REQUIRED)
-  set(QtTest_LIBRARIES Qt6::Test)
-else()
-  find_package(Qt5 ${QT_MIN_VERSION} COMPONENTS Test REQUIRED)
-  set(QtTest_LIBRARIES ${Qt5Test_LIBRARIES})
-endif()
-
-find_package(GTest REQUIRED)
-find_library(GMOCK_LIBRARY gmock REQUIRED)
-
 add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=1)
 
 set(TESTUTILS-SOURCES