From 1e37703a74eeebfa14c401db865157c39f1215bf Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Sun, 26 Feb 2023 22:32:08 +0100
Subject: build: remove pkgconfig-related code (#22422)

Cmake should already be able to find everything on its own.
---
 cmake/FindLibTermkey.cmake | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'cmake/FindLibTermkey.cmake')

diff --git a/cmake/FindLibTermkey.cmake b/cmake/FindLibTermkey.cmake
index 3e0c7f1bfd..f1f644dbd0 100644
--- a/cmake/FindLibTermkey.cmake
+++ b/cmake/FindLibTermkey.cmake
@@ -1,23 +1,8 @@
-# - Try to find libtermkey
-# Once done this will define
-#  LIBTERMKEY_FOUND - System has libtermkey
-#  LIBTERMKEY_INCLUDE_DIRS - The libtermkey include directories
-#  LIBTERMKEY_LIBRARIES - The libraries needed to use libtermkey
-
-find_package(PkgConfig)
-if (PKG_CONFIG_FOUND)
-  pkg_check_modules(PC_LIBTERMKEY QUIET termkey)
-endif()
-
-set(LIBTERMKEY_DEFINITIONS ${PC_LIBTERMKEY_CFLAGS_OTHER})
-
-find_path(LIBTERMKEY_INCLUDE_DIR termkey.h
-          PATHS ${PC_LIBTERMKEY_INCLUDEDIR} ${PC_LIBTERMKEY_INCLUDE_DIRS})
+find_path(LIBTERMKEY_INCLUDE_DIR termkey.h)
 
 list(APPEND LIBTERMKEY_NAMES termkey)
 
-find_library(LIBTERMKEY_LIBRARY NAMES ${LIBTERMKEY_NAMES}
-  HINTS ${PC_LIBTERMKEY_LIBDIR} ${PC_LIBTERMKEY_LIBRARY_DIRS})
+find_library(LIBTERMKEY_LIBRARY NAMES ${LIBTERMKEY_NAMES})
 
 set(LIBTERMKEY_LIBRARIES ${LIBTERMKEY_LIBRARY})
 set(LIBTERMKEY_INCLUDE_DIRS ${LIBTERMKEY_INCLUDE_DIR})
-- 
cgit 


From a0292b4e5f106482edc5623eef85aa48e2e55bb7 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Thu, 2 Mar 2023 10:22:41 +0100
Subject: build: remove libfindmacros library (#22423)

Large parts the library weren't being used, and the parts that were was overly
abstracted for our use case. Additionally, part of its use case was to abstract
pkgconfig boilerplate, which is no longer needed as pkgconfig has been removed
in favor of relying on cmake alone in 09118052cee5aef978d6075db5287c1b6c27381a.
---
 cmake/FindLibTermkey.cmake | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'cmake/FindLibTermkey.cmake')

diff --git a/cmake/FindLibTermkey.cmake b/cmake/FindLibTermkey.cmake
index f1f644dbd0..368cd21354 100644
--- a/cmake/FindLibTermkey.cmake
+++ b/cmake/FindLibTermkey.cmake
@@ -1,16 +1,5 @@
 find_path(LIBTERMKEY_INCLUDE_DIR termkey.h)
-
-list(APPEND LIBTERMKEY_NAMES termkey)
-
-find_library(LIBTERMKEY_LIBRARY NAMES ${LIBTERMKEY_NAMES})
-
-set(LIBTERMKEY_LIBRARIES ${LIBTERMKEY_LIBRARY})
-set(LIBTERMKEY_INCLUDE_DIRS ${LIBTERMKEY_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LIBTERMKEY_FOUND to TRUE
-# if all listed variables are TRUE
+find_library(LIBTERMKEY_LIBRARY NAMES termkey)
 find_package_handle_standard_args(LibTermkey DEFAULT_MSG
   LIBTERMKEY_LIBRARY LIBTERMKEY_INCLUDE_DIR)
-
 mark_as_advanced(LIBTERMKEY_INCLUDE_DIR LIBTERMKEY_LIBRARY)
-- 
cgit 


From 4cf4ae93df6af09ef3a0df678bb3d154b65bf731 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Thu, 2 Mar 2023 22:50:43 +0100
Subject: build: cmake cleanup (#22251)

- Remove unused code
- Use consistent casing. Variable names such as LibLuV_LIBRARIES is
  needlessly jarring, even if the name might be technically correct.
- Use title casing for packages. find_package(unibilium) requires the
  find_module to be named "Findunibilium.cmake", which makes it harder
  to spot when scanning the files. Instead, use "Unibilium".
---
 cmake/FindLibTermkey.cmake | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 cmake/FindLibTermkey.cmake

(limited to 'cmake/FindLibTermkey.cmake')

diff --git a/cmake/FindLibTermkey.cmake b/cmake/FindLibTermkey.cmake
deleted file mode 100644
index 368cd21354..0000000000
--- a/cmake/FindLibTermkey.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-find_path(LIBTERMKEY_INCLUDE_DIR termkey.h)
-find_library(LIBTERMKEY_LIBRARY NAMES termkey)
-find_package_handle_standard_args(LibTermkey DEFAULT_MSG
-  LIBTERMKEY_LIBRARY LIBTERMKEY_INCLUDE_DIR)
-mark_as_advanced(LIBTERMKEY_INCLUDE_DIR LIBTERMKEY_LIBRARY)
-- 
cgit