Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support handling of Abseil independently of Protobuf. #17414

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support handling of Abseil independently of Protobuf. #17414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ option(ENABLE_EXPORTER_MONGODB "Enable exporting to MongoDB" ${DEFAULT_FEATURE_S
option(ENABLE_BUNDLED_JSONC "Force use of a vendored copy of JSON-C" False)
option(ENABLE_BUNDLED_YAML "Force use of a vendored copy of libyaml" False)
option(ENABLE_BUNDLED_PROTOBUF "Use a vendored copy of protobuf" False)
cmake_dependent_option(ENABLE_BUNDLED_ABSEIL "Use a vendored copy of Abseil" False "NOT ENABLE_BUNDLED_PROTOBUF" True)

# Optional test code
cmake_dependent_option(ENABLE_LOGS_MANAGEMENT_TESTS "Enable test code for logs-management plugin." True "NOT ENABLE_PLUGIN_LOGS_MANAGEMENT" False)
Expand Down
126 changes: 126 additions & 0 deletions packaging/cmake/Modules/NetdataAbseil.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
# Macros and functions for handling of Abseil
#
# To use:
# - Include the NetdataAbseil module
# - Call netdata_detect_abseil() with a list of the Abseil components you need.
# - Call netdata_add_abseil_to_target() with the name of the target that needs to link against Abseil.
#
# Copyright (c) 2024 Netdata Inc.
# SPDX-License-Identifier: GPL-3.0-or-later

# Prepare a vendored copy of Abseil for use with Netdata
function(netdata_bundle_abseil)
include(FetchContent)
include(NetdataFetchContentExtra)

set(FETCHCONTENT_TRY_FIND_PACKAGE_MODE NEVER)

string(REPLACE "-fsanitize=address" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
string(REPLACE "-fsanitize=address" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

# ignore debhelper
set(FETCHCONTENT_FULLY_DISCONNECTED Off)

set(ABSL_PROPAGATE_CXX_STD On)
set(ABSL_ENABLE_INSTALL Off)

message(STATUS "Preparing bundled Abseil")
FetchContent_Declare(absl
GIT_REPOSITORY https://github.com/abseil/abseil-cpp
GIT_TAG 2f9e432cce407ce0ae50676696666f33a77d42ac # 20240116.1
)
FetchContent_MakeAvailable_NoInstall(absl)
message(STATUS "Finished preparing bundled Abseil")
set(BUNDLED_ABSEIL PARENT_SCOPE)
endfunction()

# Look for a system copy of Abseil, and if we can’t find it bundle a copy.
#
# _components is a list of Abseil component libraries to look for,
# without the `absl_` prefix. All of them must be found to use a system copy.
#
# If called multiple times with different lists of components, the
# end result will be as if it was called once with the union of the sets
# of components.
function(netdata_detect_abseil _components)
set(_components_found "${ENABLE_BUNDLED_ABSEIL}")
set(_cflags_other "${NETDATA_ABSEIL_CFLAGS_OTHER}")
set(_include_dirs "${NETDATA_ABSEIL_INCLUDE_DIRS}")
set(_libs "${NETDATA_ABSEIL_LIBS}")
set(_bundled "${BUNDLED_ABSEIL}")

if(NOT BUNDLED_ABSEIL)
if(NOT ENABLE_BUNDLED_ABSEIL)
foreach(_c LISTS _components)
set(_component_name "absl_${_c}")
pkg_check_modules("${_component_name}")

if(${_component_name}_FOUND)
list(APPEND _cflags_other "${${_component_name}_CFLAGS_OTHER}")
list(APPEND _include_dirs "${${_component_name}_INCLUDE_DIRS}")
list(APPEND _libs "${${_component_name}_LIBRARIES}")
else()
set(_components_found FALSE)
break()
endif()
endforeach()
endif()

if(NOT _components_found)
set(_cflags_other "${NETDATA_ABSEIL_CFLAGS_OTHER}")
set(_include_dirs "${NETDATA_ABSEIL_INCLUDE_DIRS}")
set(_libs "${NETDATA_ABSEIL_LIBS}")
set(_bundled TRUE)
message(WARNING "Could not find all required Abseil components, vendoring it instead")
netdata_bundle_abseil()
endif()
endif()

if(BUNDLED_ABSEIL)
foreach(_c LISTS _components)
set(_target "absl::${_c}")

if(NOT TARGET ${_target})
message(FATAL_ERROR "Abseil component ${_c} was not provided by the vendored copy of Abseil.")
endif()

get_target_property(${_c}_cflags_other ${_target} INTERFACE_COMPILE_DEFINITIONS)

if(NOT ${_c}_cflags_other STREQUAL ${_c}_cflags_other-NOTFOUND)
list(APPEND _cflags_other "${${_c}_cflags_other}")
endif()

get_target_property(${_c}_include_dirs ${_target} INTERFACE_INCLUDE_DIRECTORIES)

if(NOT ${_c}_include_dirs STREQUAL ${_c}_include_dirs-NOTFOUND)
list(APPEND _include_dirs "${${_c}_include_dirs}")
endif()

list(APPEND _libs ${_target})
endforeach()
endif()

foreach(_var ITEMS _cflags_other _include_dirs _libs)
list(REMOVE_ITEM ${_var} "")
list(REMOVE_DUPLICATES ${_var})
endforeach()

set(NETDATA_ABSEIL_CFLAGS_OTHER "${_cflags_other}" PARENT_SCOPE)
set(NETDATA_ABSEIL_INCLUDE_DIRS "${_include_dirs}" PARENT_SCOPE)
set(NETDATA_ABSEIL_LIBS "${_libs}" PARENT_SCOPE)
set(HAVE_ABSEIL TRUE PARENT_SCOPE)
set(BUNDLED_ABSEIL "${_bundled}" PARENT_SCOPE)
endfunction()

# Add Abseil to a specified target
#
# The _scope argument is optional, if not specified Abseil will be added as a PRIVATE dependency.
function(netdata_add_abseil_to_target _target _scope)
if(NOT _scope)
set(_scope PRIVATE)
endif()

target_compile_definitions(${_target} ${_scope} ${NETDATA_ABSEIL_CFLAGS_OTHER})
target_include_directories(${_target} ${_scope} ${NETDATA_ABSEIL_INCLUDE_DIRS})
target_link_libraries(${_target} ${_scope} ${NETDATA_ABSEIL_LIBS})
endfunction()
19 changes: 8 additions & 11 deletions packaging/cmake/Modules/NetdataProtobuf.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# Copyright (c) 2024 Netdata Inc.
# SPDX-License-Identifier: GPL-3.0-or-later

include(NetdataAbseil)

macro(netdata_protobuf_21_tags)
set(PROTOBUF_TAG f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c) # v21.12
set(NEED_ABSL False)
Expand All @@ -11,7 +13,6 @@ endmacro()
macro(netdata_protobuf_25_tags)
set(PROTOBUF_TAG 4a2aef570deb2bfb8927426558701e8bfc26f2a4) # v25.3
set(NEED_ABSL True)
set(ABSL_TAG 2f9e432cce407ce0ae50676696666f33a77d42ac) # 20240116.1
endmacro()

# Determine what version of protobuf and abseil to bundle.
Expand Down Expand Up @@ -54,16 +55,12 @@ function(netdata_bundle_protobuf)
set(FETCHCONTENT_FULLY_DISCONNECTED Off)

if(NEED_ABSL)
set(ABSL_PROPAGATE_CXX_STD On)
set(ABSL_ENABLE_INSTALL Off)

message(STATUS "Preparing bundled Abseil (required by bundled Protobuf)")
FetchContent_Declare(absl
GIT_REPOSITORY https://github.com/abseil/abseil-cpp
GIT_TAG ${ABSL_TAG}
)
FetchContent_MakeAvailable_NoInstall(absl)
message(STATUS "Finished preparing bundled Abseil")
if(HAVE_ABSEIL AND NOT BUNDLED_ABSEIL)
message(FATAL_ERROR "Using a system copy of Abseil is not supported if vendoring Protobuf")
endif()

netdata_bundle_abseil()
set(BUNDLED_ABSEIL PARENT_SCOPE)
endif()

set(protobuf_INSTALL Off)
Expand Down