From 00151562145df50cc65e9902d52d5fa77f89fe50 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 9 Jun 2022 06:52:47 +0200
Subject: Merging upstream version 1.35.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 CMakeLists.txt | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3df9feff..378e8a683 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -230,6 +230,15 @@ pkg_check_modules(CURL libcurl)
 # ${CURL_CFLAGS_OTHER}
 # ${CURL_INCLUDE_DIRS}
 
+# -----------------------------------------------------------------------------
+# Detect libcups
+
+pkg_check_modules(CURL libcups)
+# later we use:
+# ${CUPS_LIBRARIES}
+# ${CUPS_CFLAGS_OTHER}
+# ${CUPS_INCLUDE_DIRS}
+
 # -----------------------------------------------------------------------------
 # Detect libaws-c-common
 
@@ -383,6 +392,8 @@ set(LIBNETDATA_FILES
         libnetdata/log/log.h
         libnetdata/os.c
         libnetdata/os.h
+        libnetdata/onewayalloc/onewayalloc.c
+        libnetdata/onewayalloc/onewayalloc.h
         libnetdata/popen/popen.c
         libnetdata/popen/popen.h
         libnetdata/procfile/procfile.c
@@ -408,6 +419,8 @@ set(LIBNETDATA_FILES
         libnetdata/string/utf8.h
         libnetdata/socket/security.c
         libnetdata/socket/security.h
+        libnetdata/worker_utilization/worker_utilization.c
+        libnetdata/worker_utilization/worker_utilization.h
         libnetdata/circular_buffer/circular_buffer.c
         libnetdata/circular_buffer/circular_buffer.h)
 
@@ -487,6 +500,10 @@ set(SLABINFO_PLUGIN_FILES
         collectors/slabinfo.plugin/slabinfo.c
         )
 
+set(CUPS_PLUGIN_FILES
+        collectors/cups.plugin/cups_plugin.c
+        )
+
 set(EBPF_PROCESS_PLUGIN_FILES
         collectors/ebpf.plugin/ebpf.c
         collectors/ebpf.plugin/ebpf.h
@@ -635,6 +652,10 @@ set(RRD_PLUGIN_FILES
         database/rrdsetvar.h
         database/rrdvar.c
         database/rrdvar.h
+        database/storage_engine.c
+        database/storage_engine.h
+        database/ram/rrddim_mem.c
+        database/ram/rrddim_mem.h
         database/sqlite/sqlite_functions.c
         database/sqlite/sqlite_functions.h
         database/sqlite/sqlite_aclk.c
@@ -674,6 +695,10 @@ set(RRD_PLUGIN_FILES
         database/engine/metadata_log/metalogpluginsd.h
         database/engine/metadata_log/compaction.c
         database/engine/metadata_log/compaction.h
+        database/KolmogorovSmirnovDist.c
+        database/KolmogorovSmirnovDist.h
+        database/metric_correlations.c
+        database/metric_correlations.h
         )
 
 set(WEB_PLUGIN_FILES
@@ -792,6 +817,11 @@ set(ACLK_FILES
         mqtt_websockets/src/include/mqtt_wss_log.h
         mqtt_websockets/src/ws_client.c
         mqtt_websockets/src/include/ws_client.h
+        mqtt_websockets/src/mqtt_ng.c
+        mqtt_websockets/src/include/mqtt_ng.h
+        mqtt_websockets/src/common_public.c
+        mqtt_websockets/src/include/common_public.h
+        mqtt_websockets/src/include/common_internal.h
         mqtt_websockets/c-rbuf/src/ringbuffer.c
         mqtt_websockets/c-rbuf/include/ringbuffer.h
         mqtt_websockets/c-rbuf/src/ringbuffer_internal.h
@@ -813,6 +843,8 @@ set(ACLK_FILES
         aclk/schema-wrappers/alarm_config.h
         aclk/schema-wrappers/node_info.cc
         aclk/schema-wrappers/node_info.h
+        aclk/schema-wrappers/capability.cc
+        aclk/schema-wrappers/capability.h
         aclk/schema-wrappers/schema_wrappers.h
         aclk/schema-wrappers/schema_wrapper_utils.cc
         aclk/schema-wrappers/schema_wrapper_utils.h
@@ -1019,7 +1051,7 @@ IF(ENABLE_EXPORTING_PROMETHEUS_REMOTE_WRITE)
     message(STATUS "prometheus remote write exporting: enabled")
 
     find_package(Protobuf REQUIRED)
-    
+
     function(PROTOBUF_REMOTE_WRITE_GENERATE_CPP SRCS HDRS)
         if(NOT ARGN)
             message(SEND_ERROR "Error: PROTOBUF_REMOTE_WRITE_GENERATE_CPP() called without any proto files")
@@ -1215,6 +1247,12 @@ ELSE()
     SET(ENABLE_PLUGIN_XENSTAT False)
 ENDIF()
 
+IF(CUPS_LIBRARIES)
+    SET(ENABLE_PLUGIN_CUPS True)
+ELSE()
+    SET(ENABLE_PLUGIN_CUPS False)
+ENDIF()
+
 
 # -----------------------------------------------------------------------------
 # netdatacli
@@ -1323,6 +1361,20 @@ ELSE()
 ENDIF()
 
 
+# -----------------------------------------------------------------------------
+# cups.plugin
+
+IF(ENABLE_PLUGIN_CUPS)
+    message(STATUS "cups.plugin: enabled")
+    add_executable(cups.plugin config.h ${CUPS_PLUGIN_FILES})
+    target_link_libraries (cups.plugin libnetdata ${NETDATA_COMMON_LIBRARIES} ${CUPS_LIBRARIES})
+    target_include_directories(cups.plugin PUBLIC ${NETDATA_COMMON_INCLUDE_DIRS} ${CUPS_INCLUDE_DIRS})
+    target_compile_options(cups.plugin PUBLIC ${NETDATA_COMMON_CFLAGS} ${CUPS_CFLAGS_OTHER})
+ELSE()
+    message(STATUS "cups.plugin: disabled")
+ENDIF()
+
+
 # -----------------------------------------------------------------------------
 # cgroup-network
 
-- 
cgit v1.2.3