From 6498fe5a6beb1b937da565dbca6711dcbe614799 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Sun, 1 Dec 2024 21:17:03 -0500
Subject: [PATCH] refactor: use Qt Required Version rm configure_qt macro for
 its one use

---
 CMakeLists.txt              |  1 +
 cmake/Libraries.cmake       | 15 +++------------
 src/lib/arch/CMakeLists.txt |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 834ecc44b..3243b76cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,6 +94,7 @@ message(STATUS "Building ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
 set(REQUIRED_OPENSSL_VERSION 3.0)
 set(REQUIRED_LIBEI_VERSION 1.3)
 set(REQUIRED_LIBPORTAL_VERSION 0.8)
+set(REQUIRED_QT_VERSION 6.7.0)
 
 # Set required macOS SDK
 if(APPLE)
diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake
index e8cd30e5d..2eeebec26 100644
--- a/cmake/Libraries.cmake
+++ b/cmake/Libraries.cmake
@@ -31,7 +31,9 @@ macro(configure_libs)
     )
   endif()
 
-  configure_qt()
+  find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Widgets Network)
+
+  message(STATUS "Qt version: ${Qt6_VERSION}")
 
   # TODO SSL check can happen in lib/net when we make wix packages with cpack
 
@@ -338,14 +340,3 @@ macro(configure_xorg_libs)
   add_definitions(-DWINAPI_XWINDOWS=1)
 
 endmacro()
-
-macro(configure_qt)
-
-  find_package(
-    Qt6
-    COMPONENTS Core Widgets Network
-    REQUIRED)
-
-  message(STATUS "Qt version: ${Qt6_VERSION}")
-
-endmacro()
diff --git a/src/lib/arch/CMakeLists.txt b/src/lib/arch/CMakeLists.txt
index 478c42429..6c710c067 100644
--- a/src/lib/arch/CMakeLists.txt
+++ b/src/lib/arch/CMakeLists.txt
@@ -103,7 +103,7 @@ add_library(arch STATIC ${PLATFORM_CODE}
 if(UNIX)
   target_link_libraries(arch ${CMAKE_DL_LIBS} ${libs})
   if(NOT APPLE)
-    find_package(Qt6 COMPONENTS DBus)
+    find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS DBus)
     target_link_libraries(arch Qt6::DBus)
   endif()
 endif()