@cryptotaxi247 / netdata-1 / commits / bb2f29d56

ACLK cmake fixes (#8280)

* ACLK cmake fixes

Timo committed Mar 5, 2020 at 11:46 UTC bb2f29d56032cfdbe57006f54c6ace8f02cf84b7
1 file changed +37 -5
CMakeLists.txt
+37 -5
@@ -614,11 +614,17 @@ set(CLAIM_PLUGIN_FILES
614 set(ACLK_PLUGIN_FILES
615 aclk/agent_cloud_link.c
616 aclk/agent_cloud_link.h
617 - aclk/agent_cloud_link.c
617 + aclk/aclk_lws_wss_client.c
618 + aclk/aclk_lws_wss_client.h
619 aclk/mqtt.c
620 aclk/mqtt.h
621 )
622
623 +set(ACLK_STATIC_LIBS
624 + ${CMAKE_SOURCE_DIR}/externaldeps/mosquitto/libmosquitto.a
625 + ${CMAKE_SOURCE_DIR}/externaldeps/libwebsockets/libwebsockets.a
626 + )
627 +
628 set(EXPORTING_ENGINE_FILES
629 exporting/exporting_engine.c
630 exporting/exporting_engine.h
@@ -693,8 +699,7 @@ set(NETDATA_FILES
699 ${STREAMING_PLUGIN_FILES}
700 ${WEB_PLUGIN_FILES}
701 ${CLAIM_PLUGIN_FILES}
696 - ${ACLK_PLUGIN_FILES}
697 - )
702 +)
703
704 set(NETDATACLI_FILES
705 daemon/commands.h
@@ -771,11 +776,38 @@ ELSE()
776 message(STATUS "mongodb backend: disabled (requires mongoc library)")
777 ENDIF()
778
779 +set(NETDATA_COMMON_LIBRARIES ${NETDATA_COMMON_LIBRARIES} m ${CMAKE_THREAD_LIBS_INIT})
780 +
781 +IF("$ENV{ACLK}")
782 + set(ACLK_CAN_BUILD 1)
783 + if(NOT EXISTS "${CMAKE_SOURCE_DIR}/externaldeps/mosquitto/libmosquitto.a")
784 + message(WARNING "Static build of mosquitto not found. Disabling ACLK")
785 + set(ACLK_CAN_BUILD 0)
786 + ENDIF()
787 +
788 + if(NOT EXISTS "${CMAKE_SOURCE_DIR}/externaldeps/libwebsockets/libwebsockets.a")
789 + message(WARNING "Static build of libwebsockets not found. Disabling ACLK")
790 + set(ACLK_CAN_BUILD 0)
791 + ENDIF()
792 +
793 + IF(ACLK_CAN_BUILD)
794 + message(STATUS "agent-cloud-link: enabled")
795 + list(APPEND NETDATA_FILES ${ACLK_PLUGIN_FILES})
796 + list(APPEND NETDATA_COMMON_LIBRARIES ${ACLK_STATIC_LIBS})
797 + include_directories(BEFORE ${CMAKE_SOURCE_DIR}/externaldeps/libwebsockets/include)
798 + IF(LINUX AND CAP_FOUND)
799 + list(APPEND NETDATA_COMMON_LIBRARIES ${CAP_LIBRARIES})
800 + list(APPEND NETDATA_COMMON_INCLUDE_DIRS ${CAP_INCLUDE_DIRS})
801 + list(APPEND NETDATA_COMMON_CFLAGS ${CAP_CFLAGS_OTHER})
802 + ENDIF()
803 + ELSE()
804 + message(STATUS "agent-cloud-link: disabled")
805 + ENDIF()
806 +ENDIF()
807 +
808 # -----------------------------------------------------------------------------
809 # netdata
810
777 -set(NETDATA_COMMON_LIBRARIES ${NETDATA_COMMON_LIBRARIES} m ${CMAKE_THREAD_LIBS_INIT})
778 -
811 IF(LINUX)
812 add_executable(netdata config.h ${NETDATA_FILES}
813 ${CGROUPS_PLUGIN_FILES}