From f619b88dbac8ad009ca5f5cddb696f32878d0f72 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 26 Mar 2026 14:14:24 +0100
Subject: treewide: Allow Qt6 build to be configured via CMake

---
 tests/CMakeLists.txt        |  5 -----
 tests/client/CMakeLists.txt | 22 +++++++++++-----------
 tests/script/CMakeLists.txt |  2 +-
 3 files changed, 12 insertions(+), 17 deletions(-)

(limited to 'tests')

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0e94a94..96c4bad 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,2 @@
-find_package(Qt5Quick REQUIRED)
-find_package(Qt5Test REQUIRED)
-find_package(Qt5Widgets REQUIRED)
-find_package(Qt5DBus REQUIRED)
-
 add_subdirectory(script)
 add_subdirectory(client)
diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index 05d31f3..8a0ed49 100644
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -1,16 +1,16 @@
 macro(declare_test testname)
     add_executable(${testname} ${testname}.cpp)
     target_link_libraries(${testname}
-                          qmenumodel
+                          qmenumodel${QMENUMODEL_LIB_SUFFIX}
                           dbusmenuscript
                           ${GLIB_LDFLAGS}
                           ${GIO_LDFLAGS}
-                          Qt5::Core
-                          Qt5::DBus
-                          Qt5::Widgets
-                          Qt5::Test
-                          Qt5::Qml
-                          Qt5::Quick
+                          Qt::Core
+                          Qt::DBus
+                          Qt::Widgets
+                          Qt::Test
+                          Qt::Qml
+                          Qt::Quick
     )
 
     if(TEST_XML_OUTPUT)
@@ -34,11 +34,11 @@ endmacro(declare_test testname)
 macro(declare_simple_test testname)
     add_executable(${testname} ${testname}.cpp)
     target_link_libraries(${testname}
-                          qmenumodel
+                          qmenumodel${QMENUMODEL_LIB_SUFFIX}
                           ${GLIB_LDFLAGS}
                           ${GIO_LDFLAGS}
-                          Qt5::Core
-                          Qt5::Test
+                          Qt::Core
+                          Qt::Test
     )
 
     add_test(${testname}
@@ -76,7 +76,7 @@ if (ENABLE_COVERAGE)
     find_package(CoverageReport)
     ENABLE_COVERAGE_REPORT(
       TARGETS
-        qmenumodel
+        qmenumodel${QMENUMODEL_LIB_SUFFIX}
       FILTER
         ${CMAKE_SOURCE_DIR}/tests/*
         ${CMAKE_BINARY_DIR}/*
diff --git a/tests/script/CMakeLists.txt b/tests/script/CMakeLists.txt
index fc0db8a..37e72ab 100644
--- a/tests/script/CMakeLists.txt
+++ b/tests/script/CMakeLists.txt
@@ -4,5 +4,5 @@ add_library(dbusmenuscript STATIC dbusmenuscript.cpp)
 
 set_target_properties(dbusmenuscript PROPERTIES COMPILE_FLAGS -fPIC)
 
-target_link_libraries(dbusmenuscript Qt5::Core Qt5::DBus Qt5::Test)
+target_link_libraries(dbusmenuscript Qt::Core Qt::DBus Qt::Test)
 
-- 
cgit v1.2.3