From 3a4bf35e22c623196ac21175bf58359b2742332f Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Wed, 5 Mar 2025 21:27:50 -0500
Subject: [PATCH] refactor: Remove unneeed find_packate calls for Qt
 Components. Qt is found by Libaraies.cmake and accesable to all items in the
 src folder

---
 cmake/Libraries.cmake                   | 3 +++
 src/apps/deskflow-daemon/CMakeLists.txt | 2 --
 src/lib/arch/CMakeLists.txt             | 1 -
 src/lib/common/CMakeLists.txt           | 1 -
 src/lib/deskflow/CMakeLists.txt         | 1 -
 src/lib/platform/CMakeLists.txt         | 1 -
 6 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake
index d7b3e8843..f3b6dceea 100644
--- a/cmake/Libraries.cmake
+++ b/cmake/Libraries.cmake
@@ -21,6 +21,9 @@ macro(configure_libs)
   endif()
 
   find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Widgets Network)
+  if(UNIX AND NOT APPLE)
+      find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS DBus)
+  endif()
 
   # Define the location of Qt deployment tool
   if(WIN32)
diff --git a/src/apps/deskflow-daemon/CMakeLists.txt b/src/apps/deskflow-daemon/CMakeLists.txt
index 523f34d98..45bf20935 100644
--- a/src/apps/deskflow-daemon/CMakeLists.txt
+++ b/src/apps/deskflow-daemon/CMakeLists.txt
@@ -14,8 +14,6 @@ if(WIN32)
 
   add_executable(${target} WIN32 ${target}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${target}.rc)
 
-  find_package(Qt6 COMPONENTS Core Network)
-
   target_link_libraries(
     ${target}
     arch
diff --git a/src/lib/arch/CMakeLists.txt b/src/lib/arch/CMakeLists.txt
index 77589603b..10b1800be 100644
--- a/src/lib/arch/CMakeLists.txt
+++ b/src/lib/arch/CMakeLists.txt
@@ -84,7 +84,6 @@ add_library(arch STATIC ${PLATFORM_CODE}
 if(UNIX)
   target_link_libraries(arch ${CMAKE_DL_LIBS} ${libs})
   if(NOT APPLE)
-    find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS DBus)
     target_link_libraries(arch Qt6::DBus)
   endif()
 endif()
diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt
index 4dd661ca1..278c0dc7a 100644
--- a/src/lib/common/CMakeLists.txt
+++ b/src/lib/common/CMakeLists.txt
@@ -25,7 +25,6 @@ add_library(common INTERFACE
   ${CMAKE_CURRENT_BINARY_DIR}/constants.h
 )
 
-find_package(Qt6 COMPONENTS Core)
 target_link_libraries(common INTERFACE Qt6::Core)
 
 if(APPLE)
diff --git a/src/lib/deskflow/CMakeLists.txt b/src/lib/deskflow/CMakeLists.txt
index 1e990b188..f6617992c 100644
--- a/src/lib/deskflow/CMakeLists.txt
+++ b/src/lib/deskflow/CMakeLists.txt
@@ -149,7 +149,6 @@ add_library(${lib_name} STATIC ${PLATFORM_CODE}
   ipc/DaemonIpcServer.h
 )
 
-find_package(Qt6 COMPONENTS Core Network)
 target_link_libraries(${lib_name} PRIVATE Qt6::Core Qt6::Network)
 
 if(WIN32)
diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt
index e1a59ae73..ab876055c 100644
--- a/src/lib/platform/CMakeLists.txt
+++ b/src/lib/platform/CMakeLists.txt
@@ -184,7 +184,6 @@ if(UNIX)
     ${libs})
 
   if(NOT APPLE)
-    find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS DBus)
     target_link_libraries(platform Qt6::DBus)
 
     link_wayland_libs()