summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorTimotej S <6674623+underhood@users.noreply.github.com>2022-01-04 10:11:04 +0100
committerGitHub <noreply@github.com>2022-01-04 10:11:04 +0100
commit5736b4bcb179896280cb579ee1dbe0cfa464064c (patch)
tree3b703557152bf0970cd80cdc72032a00fb6b16e7 /CMakeLists.txt
parent2546c02f89581b0c20f9805d65bd060ad9f8af49 (diff)
Removes ACLK Legacy (#11841)
* remove legacy from makefiles * remove ACLK Legacy from installer * remove ACLK Legacy from configure.ac * remove legacy from cmake * aclk api cleanup * remove legacy files from packaging * changes for CI from Austin
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt57
1 files changed, 4 insertions, 53 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d21ea89c4a..76abbef429 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -773,26 +773,7 @@ set(ACLK_COMMON_FILES
aclk/aclk_collector_list.h
)
-set(ACLK_LEGACY_FILES
- aclk/legacy/agent_cloud_link.c
- aclk/legacy/agent_cloud_link.h
- aclk/legacy/aclk_query.c
- aclk/legacy/aclk_query.h
- aclk/legacy/aclk_lws_wss_client.c
- aclk/legacy/aclk_lws_wss_client.h
- aclk/legacy/aclk_lws_https_client.c
- aclk/legacy/aclk_lws_https_client.h
- aclk/legacy/mqtt.c
- aclk/legacy/mqtt.h
- aclk/legacy/aclk_stats.c
- aclk/legacy/aclk_stats.h
- aclk/legacy/aclk_rx_msgs.c
- aclk/legacy/aclk_rx_msgs.h
- aclk/legacy/aclk_common.c
- aclk/legacy/aclk_common.h
- )
-
-set(ACLK_NG_FILES
+set(ACLK_FILES
aclk/aclk.c
aclk/aclk.h
aclk/aclk_util.c
@@ -854,11 +835,6 @@ set(SPAWN_PLUGIN_FILES
spawn/spawn.h
)
-set(ACLK_LEGACY_STATIC_LIBS
- ${CMAKE_SOURCE_DIR}/externaldeps/mosquitto/libmosquitto.a
- ${CMAKE_SOURCE_DIR}/externaldeps/libwebsockets/libwebsockets.a
- )
-
set(EXPORTING_ENGINE_FILES
exporting/exporting_engine.c
exporting/exporting_engine.h
@@ -1070,31 +1046,6 @@ ENDIF()
set(NETDATA_COMMON_LIBRARIES ${NETDATA_COMMON_LIBRARIES} m ${CMAKE_THREAD_LIBS_INIT})
-set(ACLK_LEGACY_CAN_BUILD 1)
-if(NOT EXISTS "${CMAKE_SOURCE_DIR}/externaldeps/mosquitto/libmosquitto.a")
- message(WARNING "Static build of mosquitto not found. Disabling ACLK")
- set(ACLK_LEGACY_CAN_BUILD 0)
-ENDIF()
-
-if(NOT EXISTS "${CMAKE_SOURCE_DIR}/externaldeps/libwebsockets/libwebsockets.a")
- message(WARNING "Static build of libwebsockets not found. Disabling ACLK")
- set(ACLK_LEGACY_CAN_BUILD 0)
-ENDIF()
-
-IF(ACLK_LEGACY_CAN_BUILD)
- message(STATUS "agent-cloud-link Legacy: enabled")
- list(APPEND NETDATA_FILES ${ACLK_LEGACY_FILES})
- list(APPEND NETDATA_COMMON_LIBRARIES ${ACLK_LEGACY_STATIC_LIBS})
- include_directories(BEFORE ${CMAKE_SOURCE_DIR}/externaldeps/libwebsockets/include)
- IF(LINUX AND CAP_FOUND)
- list(APPEND NETDATA_COMMON_LIBRARIES ${CAP_LIBRARIES})
- list(APPEND NETDATA_COMMON_INCLUDE_DIRS ${CAP_INCLUDE_DIRS})
- list(APPEND NETDATA_COMMON_CFLAGS ${CAP_CFLAGS_OTHER})
- ENDIF()
-ELSE()
- message(STATUS "agent-cloud-link Legacy: disabled")
-ENDIF()
-
find_package(Protobuf REQUIRED)
function(PROTOBUF_ACLK_GENERATE_CPP SRCS HDRS)
@@ -1133,7 +1084,7 @@ function(PROTOBUF_ACLK_GENERATE_CPP SRCS HDRS)
set(${HDRS} ${${HDRS}} PARENT_SCOPE)
endfunction()
-set(ACLK_NG_PROTO_DEFS
+set(ACLK_PROTO_DEFS
aclk/aclk-schemas/proto/aclk/v1/lib.proto
aclk/aclk-schemas/proto/agent/v1/disconnect.proto
aclk/aclk-schemas/proto/agent/v1/connection.proto
@@ -1147,13 +1098,13 @@ set(ACLK_NG_PROTO_DEFS
aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.proto
aclk/aclk-schemas/proto/nodeinstance/info/v1/info.proto
)
-PROTOBUF_ACLK_GENERATE_CPP(ACLK_NG_PROTO_BUILT_SRCS ACLK_NG_PROTO_BUILT_HDRS ${ACLK_NG_PROTO_DEFS})
+PROTOBUF_ACLK_GENERATE_CPP(ACLK_PROTO_BUILT_SRCS ACLK_PROTO_BUILT_HDRS ${ACLK_PROTO_DEFS})
list(APPEND NETDATA_COMMON_LIBRARIES ${PROTOBUF_LIBRARIES})
list(APPEND NETDATA_COMMON_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIRS})
list(APPEND NETDATA_COMMON_CFLAGS ${PROTOBUF_CFLAGS_OTHER})
list(APPEND NETDATA_FILES ${ACLK_ALWAYS_BUILD})
-list(APPEND NETDATA_FILES ${ACLK_NG_FILES} ${ACLK_NG_PROTO_BUILT_SRCS} ${ACLK_NG_PROTO_BUILT_HDRS})
+list(APPEND NETDATA_FILES ${ACLK_FILES} ${ACLK_PROTO_BUILT_SRCS} ${ACLK_PROTO_BUILT_HDRS})
list(APPEND NETDATA_FILES ${ACLK_COMMON_FILES})
include_directories(BEFORE ${CMAKE_SOURCE_DIR}/aclk/aclk-schemas)
include_directories(BEFORE ${CMAKE_SOURCE_DIR}/mqtt_websockets/MQTT-C/include)