@cryptotaxi247 / netdata-1 / commits / ab86c07f4

Adds missing files for streaming changes into cmake build (#9316)

adds missing files for streaming into cmake, removes deprecated ACLK feature flag

Timotej S committed Jun 11, 2020 at 14:28 UTC ab86c07f48ad11d49efff575fb3c415e4b889f26
1 file changed +25 -23
CMakeLists.txt
+25 -23
@@ -353,7 +353,9 @@ set(LIBNETDATA_FILES
353 libnetdata/health/health.h
354 libnetdata/string/utf8.h
355 libnetdata/socket/security.c
356 - libnetdata/socket/security.h)
356 + libnetdata/socket/security.h
357 + libnetdata/circular_buffer/circular_buffer.c
358 + libnetdata/circular_buffer/circular_buffer.h)
359
360 add_library(libnetdata OBJECT ${LIBNETDATA_FILES})
361
@@ -620,6 +622,8 @@ set(API_PLUGIN_FILES
622 set(STREAMING_PLUGIN_FILES
623 streaming/rrdpush.c
624 streaming/rrdpush.h
625 + streaming/receiver.c
626 + streaming/sender.c
627 )
628
629 set(BACKENDS_PLUGIN_FILES
@@ -863,31 +867,29 @@ ENDIF()
867
868 set(NETDATA_COMMON_LIBRARIES ${NETDATA_COMMON_LIBRARIES} m ${CMAKE_THREAD_LIBS_INIT})
869
866 -IF("$ENV{ACLK}")
867 - set(ACLK_CAN_BUILD 1)
868 - if(NOT EXISTS "${CMAKE_SOURCE_DIR}/externaldeps/mosquitto/libmosquitto.a")
869 - message(WARNING "Static build of mosquitto not found. Disabling ACLK")
870 - set(ACLK_CAN_BUILD 0)
871 - ENDIF()
870 +set(ACLK_CAN_BUILD 1)
871 +if(NOT EXISTS "${CMAKE_SOURCE_DIR}/externaldeps/mosquitto/libmosquitto.a")
872 + message(WARNING "Static build of mosquitto not found. Disabling ACLK")
873 + set(ACLK_CAN_BUILD 0)
874 +ENDIF()
875
873 - if(NOT EXISTS "${CMAKE_SOURCE_DIR}/externaldeps/libwebsockets/libwebsockets.a")
874 - message(WARNING "Static build of libwebsockets not found. Disabling ACLK")
875 - set(ACLK_CAN_BUILD 0)
876 - ENDIF()
876 +if(NOT EXISTS "${CMAKE_SOURCE_DIR}/externaldeps/libwebsockets/libwebsockets.a")
877 + message(WARNING "Static build of libwebsockets not found. Disabling ACLK")
878 + set(ACLK_CAN_BUILD 0)
879 +ENDIF()
880
878 - IF(ACLK_CAN_BUILD)
879 - message(STATUS "agent-cloud-link: enabled")
880 - list(APPEND NETDATA_FILES ${ACLK_PLUGIN_FILES})
881 - list(APPEND NETDATA_COMMON_LIBRARIES ${ACLK_STATIC_LIBS})
882 - include_directories(BEFORE ${CMAKE_SOURCE_DIR}/externaldeps/libwebsockets/include)
883 - IF(LINUX AND CAP_FOUND)
884 - list(APPEND NETDATA_COMMON_LIBRARIES ${CAP_LIBRARIES})
885 - list(APPEND NETDATA_COMMON_INCLUDE_DIRS ${CAP_INCLUDE_DIRS})
886 - list(APPEND NETDATA_COMMON_CFLAGS ${CAP_CFLAGS_OTHER})
887 - ENDIF()
888 - ELSE()
889 - message(STATUS "agent-cloud-link: disabled")
881 +IF(ACLK_CAN_BUILD)
882 + message(STATUS "agent-cloud-link: enabled")
883 + list(APPEND NETDATA_FILES ${ACLK_PLUGIN_FILES})
884 + list(APPEND NETDATA_COMMON_LIBRARIES ${ACLK_STATIC_LIBS})
885 + include_directories(BEFORE ${CMAKE_SOURCE_DIR}/externaldeps/libwebsockets/include)
886 + IF(LINUX AND CAP_FOUND)
887 + list(APPEND NETDATA_COMMON_LIBRARIES ${CAP_LIBRARIES})
888 + list(APPEND NETDATA_COMMON_INCLUDE_DIRS ${CAP_INCLUDE_DIRS})
889 + list(APPEND NETDATA_COMMON_CFLAGS ${CAP_CFLAGS_OTHER})
890 ENDIF()
891 +ELSE()
892 + message(STATUS "agent-cloud-link: disabled")
893 ENDIF()
894
895 # -----------------------------------------------------------------------------