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/FindTreeSitter.cmake | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'cmake/FindTreeSitter.cmake') diff --git a/cmake/FindTreeSitter.cmake b/cmake/FindTreeSitter.cmake index ae0928e9f7..2850a61b57 100644 --- a/cmake/FindTreeSitter.cmake +++ b/cmake/FindTreeSitter.cmake @@ -1,11 +1,5 @@ -# - Try to find tree-sitter -# Once done, this will define -# -# TreeSitter_FOUND - system has tree-sitter -# TreeSitter_INCLUDE_DIRS - the tree-sitter include directories -# TreeSitter_LIBRARIES - link these to use tree-sitter - -include(LibFindMacros) - -libfind_pkg_detect(TreeSitter tree-sitter FIND_PATH tree_sitter/api.h FIND_LIBRARY tree-sitter) -libfind_process(TreeSitter) +find_path(TreeSitter_INCLUDE_DIR tree_sitter/api.h) +find_library(TreeSitter_LIBRARY NAMES tree-sitter) +find_package_handle_standard_args(TreeSitter DEFAULT_MSG + TreeSitter_LIBRARY TreeSitter_INCLUDE_DIR) +mark_as_advanced(TreeSitter_LIBRARY TreeSitter_INCLUDE_DIR) -- 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/FindTreeSitter.cmake | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 cmake/FindTreeSitter.cmake (limited to 'cmake/FindTreeSitter.cmake') diff --git a/cmake/FindTreeSitter.cmake b/cmake/FindTreeSitter.cmake deleted file mode 100644 index 2850a61b57..0000000000 --- a/cmake/FindTreeSitter.cmake +++ /dev/null @@ -1,5 +0,0 @@ -find_path(TreeSitter_INCLUDE_DIR tree_sitter/api.h) -find_library(TreeSitter_LIBRARY NAMES tree-sitter) -find_package_handle_standard_args(TreeSitter DEFAULT_MSG - TreeSitter_LIBRARY TreeSitter_INCLUDE_DIR) -mark_as_advanced(TreeSitter_LIBRARY TreeSitter_INCLUDE_DIR) -- cgit