From 91b9eed2d02f4ad390b83b981f8201bd0eb195b5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 19 Sep 2023 12:36:44 +0200
Subject: [PATCH] Ensure `use_package` is defined when configuring capslock
 detection

---
 CMakeLists.txt | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ddaf4e..2877aa6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,10 +116,24 @@ set(SCRIPT_FILES scripts/required_icons.sh)
 # required to include CMake modules from own project directory
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" "${CMAKE_MODULE_PATH}")
 
+# find c++utilities
+set(CONFIGURATION_PACKAGE_SUFFIX
+    ""
+    CACHE STRING "sets the suffix for find_package() calls to packages configured via c++utilities")
+set(PACKAGE_NAMESPACE
+    ""
+    CACHE STRING "sets the namespace (prefix) for find_package() calls to packages configured via c++utilities")
+if (PACKAGE_NAMESPACE)
+    set(PACKAGE_NAMESPACE_PREFIX "${PACKAGE_NAMESPACE}-")
+endif ()
+find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.5.0 REQUIRED)
+use_cpp_utilities()
+
 # configure platform specific capslock detection for enterpassworddialog.cpp
 if (WIN32)
     set(HAVE_PLATFORM_SPECIFIC_CAPSLOCK_DETECTION ON)
 else ()
+    include(3rdParty)
     use_package(TARGET_NAME X11::X11 PACKAGE_NAME X11)
     if (TARGET X11::X11)
         set_property(
@@ -162,19 +176,6 @@ else ()
     message(STATUS "D-Bus notifications disabled")
 endif ()
 
-# find c++utilities
-set(CONFIGURATION_PACKAGE_SUFFIX
-    ""
-    CACHE STRING "sets the suffix for find_package() calls to packages configured via c++utilities")
-set(PACKAGE_NAMESPACE
-    ""
-    CACHE STRING "sets the namespace (prefix) for find_package() calls to packages configured via c++utilities")
-if (PACKAGE_NAMESPACE)
-    set(PACKAGE_NAMESPACE_PREFIX "${PACKAGE_NAMESPACE}-")
-endif ()
-find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.5.0 REQUIRED)
-use_cpp_utilities()
-
 # include modules to apply configuration
 include(BasicConfig)
 include(QtGuiConfig)