From 74eef8b8d78857d0509f161ac4e67df37f600bd6 Mon Sep 17 00:00:00 2001 From: "Austin S. Hemmelgarn" <austin@netdata.cloud> Date: Mon, 27 Jan 2025 14:30:10 -0500 Subject: [PATCH] Fix up libsensors vendoring. (#19369) --- packaging/cmake/Modules/FindLibSensors.cmake | 23 ------------------- .../debugfs.plugin/libsensors/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 packaging/cmake/Modules/FindLibSensors.cmake diff --git a/packaging/cmake/Modules/FindLibSensors.cmake b/packaging/cmake/Modules/FindLibSensors.cmake deleted file mode 100644 index 5ee877ce3e..0000000000 --- a/packaging/cmake/Modules/FindLibSensors.cmake +++ /dev/null @@ -1,23 +0,0 @@ -# FindLibSensors.cmake -# Locate libsensors library and headers - -# Locate the libsensors header file -find_path(LibSensors_INCLUDE_DIRS - NAMES sensors/sensors.h - PATHS /usr/include /usr/local/include -) - -# Locate the libsensors library -find_library(LibSensors_LIBRARIES - NAMES sensors - PATHS /usr/lib /usr/local/lib -) - -# Check if both the library and header were found -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(LibSensors - REQUIRED_VARS LibSensors_LIBRARIES LibSensors_INCLUDE_DIRS -) - -# Mark the variables as advanced (not shown in the GUI by default) -mark_as_advanced(LibSensors_LIBRARIES LibSensors_INCLUDE_DIRS) diff --git a/src/collectors/debugfs.plugin/libsensors/CMakeLists.txt b/src/collectors/debugfs.plugin/libsensors/CMakeLists.txt index 3b0ba40ff2..e44489ee80 100644 --- a/src/collectors/debugfs.plugin/libsensors/CMakeLists.txt +++ b/src/collectors/debugfs.plugin/libsensors/CMakeLists.txt @@ -1,5 +1,5 @@ # CMake configuration for libsensors -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16.0...3.30) # Add static library for libsensors add_library(vendored_libsensors STATIC