From 12085f96264835de7fb2fb607e57edcef603346c Mon Sep 17 00:00:00 2001 From: Olivier Roques Date: Thu, 19 Nov 2020 09:36:59 +0000 Subject: [HICN-657] Remove common.h dependency in collectd plugins In Ubuntu 20.04, the file common.h is not shipped with collectd packages anymore. This patch removes that dependency from the collectd plugins. Change-Id: I234389ee9cbfd1f1820efdb34d532a7b11618206 Signed-off-by: Olivier Roques --- cmake/Modules/FindCollectd.cmake | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'cmake') diff --git a/cmake/Modules/FindCollectd.cmake b/cmake/Modules/FindCollectd.cmake index 76d2df43f..244fd14e5 100644 --- a/cmake/Modules/FindCollectd.cmake +++ b/cmake/Modules/FindCollectd.cmake @@ -25,21 +25,15 @@ find_path(COLLECTD_INCLUDE_DIR collectd.h DOC "Find the collectd includes" ) -find_path(COLLECTD_COMMON_INCLUDE_DIR common.h - HINTS ${COLLECTD_SEARCH_PATH_LIST} - PATH_SUFFIXES include/collectd/core/daemon/ utils/common/ - DOC "Find the collectd includes" -) - find_path(COLLECTD_CONFIG_INCLUDE_DIR config.h HINTS ${COLLECTD_SEARCH_PATH_LIST} PATH_SUFFIXES include/collectd/core/ DOC "Find the collectd includes" ) -message(STATUS ${COLLECTD_INCLUDE_DIR} ${COLLECTD_COMMON_INCLUDE_DIR} ${COLLECTD_CONFIG_INCLUDE_DIR}) +message(STATUS ${COLLECTD_INCLUDE_DIR} ${COLLECTD_CONFIG_INCLUDE_DIR}) -set(COLLECTD_INCLUDE_DIRS ${COLLECTD_INCLUDE_DIR} ${COLLECTD_COMMON_INCLUDE_DIR} ${COLLECTD_CONFIG_INCLUDE_DIR}) +set(COLLECTD_INCLUDE_DIRS ${COLLECTD_INCLUDE_DIR} ${COLLECTD_CONFIG_INCLUDE_DIR}) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Collectd DEFAULT_MSG COLLECTD_INCLUDE_DIRS) -- cgit 1.2.3-korg