From 7aa706430d32dbec3f26d63c44a96b2e4df1a93c Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Fri, 3 Jan 2025 10:19:51 -0300 Subject: [PATCH] chore: update 3rd party dependencies --- cmake/opentelemetry-proto.cmake | 338 -------------------------------- cmake/opentelemetry-tools.cmake | 116 ----------- conanfile.py | 10 +- src/CMakeLists.txt | 7 - 4 files changed, 5 insertions(+), 466 deletions(-) delete mode 100644 cmake/opentelemetry-proto.cmake delete mode 100644 cmake/opentelemetry-tools.cmake diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake deleted file mode 100644 index c93e0ea3d..000000000 --- a/cmake/opentelemetry-proto.cmake +++ /dev/null @@ -1,338 +0,0 @@ -# Copyright The OpenTelemetry Authors -# SPDX-License-Identifier: Apache-2.0 - -# -# The dependency on opentelemetry-proto can be provided different ways. By order -# of decreasing priority, options are: -# -# 1 - Use a provided package -# -# This is useful to build opentelemetry-cpp as part of a super project. -# -# The super project provides the path to the opentelemetry-proto source code -# using variable ${OTELCPP_PROTO_PATH} -# -# 2 - Search for a opentelemetry-proto git submodule -# -# When git submodule is used, the opentelemetry-proto code is located in: -# third_party/opentelemetry-proto -# -# 3 - Download opentelemetry-proto from github -# -# Code from the required version is used, unless a specific release tag is -# provided in variable ${opentelemetry-proto} -# - -if(OTELCPP_PROTO_PATH) - if(NOT EXISTS - "${OTELCPP_PROTO_PATH}/opentelemetry/proto/common/v1/common.proto") - message( - FATAL_ERROR - "OTELCPP_PROTO_PATH does not point to a opentelemetry-proto repository") - endif() - message(STATUS "opentelemetry-proto dependency satisfied by: external path") - set(PROTO_PATH ${OTELCPP_PROTO_PATH}) - set(needs_proto_download FALSE) -else() - if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/opentelemetry-proto/.git) - message(STATUS "opentelemetry-proto dependency satisfied by: git submodule") - set(PROTO_PATH - "${CMAKE_CURRENT_SOURCE_DIR}/third_party/opentelemetry-proto") - set(needs_proto_download FALSE) - else() - message( - STATUS "opentelemetry-proto dependency satisfied by: github download") - if("${opentelemetry-proto}" STREQUAL "") - set(opentelemetry-proto "v1.0.0") - endif() - include(ExternalProject) - ExternalProject_Add( - opentelemetry-proto - GIT_REPOSITORY https://github.com/open-telemetry/opentelemetry-proto.git - GIT_TAG "${opentelemetry-proto}" - UPDATE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" - CONFIGURE_COMMAND "" - TEST_AFTER_INSTALL 0 - DOWNLOAD_NO_PROGRESS 1 - LOG_CONFIGURE 1 - LOG_BUILD 1 - LOG_INSTALL 1) - ExternalProject_Get_Property(opentelemetry-proto INSTALL_DIR) - set(PROTO_PATH "${INSTALL_DIR}/src/opentelemetry-proto") - set(needs_proto_download TRUE) - endif() -endif() - -set(COMMON_PROTO "${PROTO_PATH}/opentelemetry/proto/common/v1/common.proto") -set(RESOURCE_PROTO - "${PROTO_PATH}/opentelemetry/proto/resource/v1/resource.proto") -set(TRACE_PROTO "${PROTO_PATH}/opentelemetry/proto/trace/v1/trace.proto") -set(LOGS_PROTO "${PROTO_PATH}/opentelemetry/proto/logs/v1/logs.proto") -set(METRICS_PROTO "${PROTO_PATH}/opentelemetry/proto/metrics/v1/metrics.proto") - -set(TRACE_SERVICE_PROTO - "${PROTO_PATH}/opentelemetry/proto/collector/trace/v1/trace_service.proto") -set(LOGS_SERVICE_PROTO - "${PROTO_PATH}/opentelemetry/proto/collector/logs/v1/logs_service.proto") -set(METRICS_SERVICE_PROTO - "${PROTO_PATH}/opentelemetry/proto/collector/metrics/v1/metrics_service.proto" -) - -set(GENERATED_PROTOBUF_PATH - "${CMAKE_BINARY_DIR}/generated/third_party/opentelemetry-proto") - -file(MAKE_DIRECTORY "${GENERATED_PROTOBUF_PATH}") - -set(COMMON_PB_CPP_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/common/v1/common.pb.cc") -set(COMMON_PB_H_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/common/v1/common.pb.h") -set(RESOURCE_PB_CPP_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/resource/v1/resource.pb.cc") -set(RESOURCE_PB_H_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/resource/v1/resource.pb.h") -set(TRACE_PB_CPP_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/trace/v1/trace.pb.cc") -set(TRACE_PB_H_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/trace/v1/trace.pb.h") -set(LOGS_PB_CPP_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/logs/v1/logs.pb.cc") -set(LOGS_PB_H_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/logs/v1/logs.pb.h") -set(METRICS_PB_CPP_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/metrics/v1/metrics.pb.cc") -set(METRICS_PB_H_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/metrics/v1/metrics.pb.h") - -set(TRACE_SERVICE_PB_CPP_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/trace/v1/trace_service.pb.cc" -) -set(TRACE_SERVICE_PB_H_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/trace/v1/trace_service.pb.h" -) -if(WITH_OTLP_GRPC) - set(TRACE_SERVICE_GRPC_PB_CPP_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/trace/v1/trace_service.grpc.pb.cc" - ) - set(TRACE_SERVICE_GRPC_PB_H_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/trace/v1/trace_service.grpc.pb.h" - ) -endif() -set(LOGS_SERVICE_PB_CPP_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/logs/v1/logs_service.pb.cc" -) -set(LOGS_SERVICE_PB_H_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/logs/v1/logs_service.pb.h" -) -if(WITH_OTLP_GRPC) - set(LOGS_SERVICE_GRPC_PB_CPP_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/logs/v1/logs_service.grpc.pb.cc" - ) - set(LOGS_SERVICE_GRPC_PB_H_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/logs/v1/logs_service.grpc.pb.h" - ) -endif() -set(METRICS_SERVICE_PB_CPP_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/metrics/v1/metrics_service.pb.cc" -) -set(METRICS_SERVICE_PB_H_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h" -) -if(WITH_OTLP_GRPC) - set(METRICS_SERVICE_GRPC_PB_CPP_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/metrics/v1/metrics_service.grpc.pb.cc" - ) - set(METRICS_SERVICE_GRPC_PB_H_FILE - "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/metrics/v1/metrics_service.grpc.pb.h" - ) -endif() - -foreach(IMPORT_DIR ${PROTOBUF_IMPORT_DIRS}) - list(APPEND PROTOBUF_INCLUDE_FLAGS "-I${IMPORT_DIR}") -endforeach() - -if(WITH_OTLP_GRPC) - if(CMAKE_CROSSCOMPILING) - find_program(gRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin) - else() - if(TARGET gRPC::grpc_cpp_plugin) - project_build_tools_get_imported_location(gRPC_CPP_PLUGIN_EXECUTABLE - gRPC::grpc_cpp_plugin) - else() - find_program(gRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin) - endif() - endif() - message(STATUS "gRPC_CPP_PLUGIN_EXECUTABLE=${gRPC_CPP_PLUGIN_EXECUTABLE}") -endif() - -set(PROTOBUF_COMMON_FLAGS "--proto_path=${PROTO_PATH}" - "--cpp_out=${GENERATED_PROTOBUF_PATH}") -# --experimental_allow_proto3_optional is available from 3.13 and be stable and -# enabled by default from 3.16 -if(Protobuf_VERSION AND Protobuf_VERSION VERSION_LESS "3.16") - list(APPEND PROTOBUF_COMMON_FLAGS "--experimental_allow_proto3_optional") -elseif(PROTOBUF_VERSION AND PROTOBUF_VERSION VERSION_LESS "3.16") - list(APPEND PROTOBUF_COMMON_FLAGS "--experimental_allow_proto3_optional") -endif() - -set(PROTOBUF_GENERATED_FILES - ${COMMON_PB_H_FILE} - ${COMMON_PB_CPP_FILE} - ${RESOURCE_PB_H_FILE} - ${RESOURCE_PB_CPP_FILE} - ${TRACE_PB_H_FILE} - ${TRACE_PB_CPP_FILE} - ${LOGS_PB_H_FILE} - ${LOGS_PB_CPP_FILE} - ${METRICS_PB_H_FILE} - ${METRICS_PB_CPP_FILE} - ${TRACE_SERVICE_PB_H_FILE} - ${TRACE_SERVICE_PB_CPP_FILE} - ${LOGS_SERVICE_PB_H_FILE} - ${LOGS_SERVICE_PB_CPP_FILE} - ${METRICS_SERVICE_PB_H_FILE} - ${METRICS_SERVICE_PB_CPP_FILE}) - -if(WITH_OTLP_GRPC) - list(APPEND PROTOBUF_COMMON_FLAGS - "--grpc_out=generate_mock_code=true:${GENERATED_PROTOBUF_PATH}" - --plugin=protoc-gen-grpc="${gRPC_CPP_PLUGIN_EXECUTABLE}") - - list( - APPEND - PROTOBUF_GENERATED_FILES - ${TRACE_SERVICE_GRPC_PB_H_FILE} - ${TRACE_SERVICE_GRPC_PB_CPP_FILE} - ${LOGS_SERVICE_GRPC_PB_H_FILE} - ${LOGS_SERVICE_GRPC_PB_CPP_FILE} - ${METRICS_SERVICE_GRPC_PB_H_FILE} - ${METRICS_SERVICE_GRPC_PB_CPP_FILE}) -endif() - -set(PROTOBUF_RUN_PROTOC_COMMAND "\"${PROTOBUF_PROTOC_EXECUTABLE}\"") -foreach( - PROTOBUF_RUN_PROTOC_ARG - ${PROTOBUF_COMMON_FLAGS} - ${PROTOBUF_INCLUDE_FLAGS} - ${COMMON_PROTO} - ${RESOURCE_PROTO} - ${TRACE_PROTO} - ${LOGS_PROTO} - ${METRICS_PROTO} - ${TRACE_SERVICE_PROTO} - ${LOGS_SERVICE_PROTO} - ${METRICS_SERVICE_PROTO}) - set(PROTOBUF_RUN_PROTOC_COMMAND - "${PROTOBUF_RUN_PROTOC_COMMAND} \"${PROTOBUF_RUN_PROTOC_ARG}\"") -endforeach() - -add_custom_command( - OUTPUT ${PROTOBUF_GENERATED_FILES} - COMMAND - ${PROTOBUF_PROTOC_EXECUTABLE} ${PROTOBUF_COMMON_FLAGS} - ${PROTOBUF_INCLUDE_FLAGS} ${COMMON_PROTO} ${RESOURCE_PROTO} ${TRACE_PROTO} - ${LOGS_PROTO} ${METRICS_PROTO} ${TRACE_SERVICE_PROTO} ${LOGS_SERVICE_PROTO} - ${METRICS_SERVICE_PROTO} - COMMENT "[Run]: ${PROTOBUF_RUN_PROTOC_COMMAND}") - -include_directories("${GENERATED_PROTOBUF_PATH}") - -unset(OTELCPP_PROTO_TARGET_OPTIONS) -if(CMAKE_SYSTEM_NAME MATCHES "Windows|MinGW|WindowsStore") - list(APPEND OTELCPP_PROTO_TARGET_OPTIONS STATIC) -elseif(NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS) - list(APPEND OTELCPP_PROTO_TARGET_OPTIONS SHARED) -else() - list(APPEND OTELCPP_PROTO_TARGET_OPTIONS STATIC) -endif() - -set(OPENTELEMETRY_PROTO_TARGETS opentelemetry_proto) -add_library( - opentelemetry_proto - ${OTELCPP_PROTO_TARGET_OPTIONS} - ${COMMON_PB_CPP_FILE} - ${RESOURCE_PB_CPP_FILE} - ${TRACE_PB_CPP_FILE} - ${LOGS_PB_CPP_FILE} - ${METRICS_PB_CPP_FILE} - ${TRACE_SERVICE_PB_CPP_FILE} - ${LOGS_SERVICE_PB_CPP_FILE} - ${METRICS_SERVICE_PB_CPP_FILE}) - -if(WITH_ABSEIL) - target_link_libraries(opentelemetry_proto PUBLIC absl::bad_variant_access) -endif() - -if(WITH_OTLP_GRPC) - add_library( - opentelemetry_proto_grpc - ${OTELCPP_PROTO_TARGET_OPTIONS} ${TRACE_SERVICE_GRPC_PB_CPP_FILE} - ${LOGS_SERVICE_GRPC_PB_CPP_FILE} ${METRICS_SERVICE_GRPC_PB_CPP_FILE}) - - list(APPEND OPENTELEMETRY_PROTO_TARGETS opentelemetry_proto_grpc) - target_link_libraries(opentelemetry_proto_grpc - PUBLIC opentelemetry_proto) - - get_target_property(grpc_lib_type gRPC::grpc++ TYPE) - if (grpc_lib_type STREQUAL "SHARED_LIBRARY") - target_link_libraries(opentelemetry_proto_grpc - PUBLIC gRPC::grpc++) - endif() - set_target_properties(opentelemetry_proto_grpc PROPERTIES EXPORT_NAME - proto_grpc) - patch_protobuf_targets(opentelemetry_proto_grpc) - get_target_property(GRPC_INCLUDE_DIRECTORY gRPC::grpc++ - INTERFACE_INCLUDE_DIRECTORIES) - if(GRPC_INCLUDE_DIRECTORY) - target_include_directories( - opentelemetry_proto_grpc - PUBLIC "$") - endif() -endif() - -if(needs_proto_download) - add_dependencies(opentelemetry_proto opentelemetry-proto) -endif() -set_target_properties(opentelemetry_proto PROPERTIES EXPORT_NAME proto) -patch_protobuf_targets(opentelemetry_proto) - -if(OPENTELEMETRY_INSTALL) - install( - TARGETS ${OPENTELEMETRY_PROTO_TARGETS} - EXPORT "${PROJECT_NAME}-target" - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - install( - DIRECTORY ${GENERATED_PROTOBUF_PATH}/opentelemetry - DESTINATION include - FILES_MATCHING - PATTERN "*.h") -endif() - -if(TARGET protobuf::libprotobuf) - target_link_libraries(opentelemetry_proto PUBLIC protobuf::libprotobuf) -else() # cmake 3.8 or lower - target_include_directories(opentelemetry_proto - PUBLIC ${Protobuf_INCLUDE_DIRS}) - target_link_libraries(opentelemetry_proto PUBLIC ${Protobuf_LIBRARIES}) -endif() - -if(WITH_OTLP_GRPC) - if(WITH_ABSEIL) - find_package(absl CONFIG) - if(TARGET absl::synchronization) - target_link_libraries(opentelemetry_proto_grpc - PRIVATE absl::synchronization) - endif() - endif() -endif() - -if(BUILD_SHARED_LIBS) - foreach(proto_target ${OPENTELEMETRY_PROTO_TARGETS}) - set_property(TARGET ${proto_target} PROPERTY POSITION_INDEPENDENT_CODE ON) - endforeach() -endif() \ No newline at end of file diff --git a/cmake/opentelemetry-tools.cmake b/cmake/opentelemetry-tools.cmake deleted file mode 100644 index 84ce8be91..000000000 --- a/cmake/opentelemetry-tools.cmake +++ /dev/null @@ -1,116 +0,0 @@ -macro(check_append_cxx_compiler_flag OUTPUT_VAR) - foreach(CHECK_FLAG ${ARGN}) - check_cxx_compiler_flag(${CHECK_FLAG} - "check_cxx_compiler_flag_${CHECK_FLAG}") - if(check_cxx_compiler_flag_${CHECK_FLAG}) - list(APPEND ${OUTPUT_VAR} ${CHECK_FLAG}) - endif() - endforeach() -endmacro() - -if(NOT PATCH_PROTOBUF_SOURCES_OPTIONS_SET) - if(MSVC) - unset(PATCH_PROTOBUF_SOURCES_OPTIONS CACHE) - set(PATCH_PROTOBUF_SOURCES_OPTIONS /wd4244 /wd4251 /wd4267 /wd4309 /wd4668 /wd4946 /wd6001 /wd6244 /wd6246) - - if(MSVC_VERSION GREATER_EQUAL 1922) - # see - # https://docs.microsoft.com/en-us/cpp/overview/cpp-conformance-improvements?view=vs-2019#improvements_162 - # for detail - list(APPEND PATCH_PROTOBUF_SOURCES_OPTIONS /wd5054) - endif() - - if(MSVC_VERSION GREATER_EQUAL 1925) - list(APPEND PATCH_PROTOBUF_SOURCES_OPTIONS /wd4996) - endif() - - if(MSVC_VERSION LESS 1910) - list(APPEND PATCH_PROTOBUF_SOURCES_OPTIONS /wd4800) - endif() - else() - unset(PATCH_PROTOBUF_SOURCES_OPTIONS CACHE) - include(CheckCXXCompilerFlag) - check_append_cxx_compiler_flag( - PATCH_PROTOBUF_SOURCES_OPTIONS -Wno-type-limits -Wno-missing-declarations - -Wno-deprecated-declarations -Wno-unused-parameter) - endif() - set(PATCH_PROTOBUF_SOURCES_OPTIONS_SET TRUE) - if(PATCH_PROTOBUF_SOURCES_OPTIONS) - set(PATCH_PROTOBUF_SOURCES_OPTIONS - ${PATCH_PROTOBUF_SOURCES_OPTIONS} - CACHE INTERNAL - "Options to disable warning of generated protobuf sources" FORCE) - endif() -endif() - -function(patch_protobuf_sources) - if(PATCH_PROTOBUF_SOURCES_OPTIONS) - foreach(PROTO_SRC ${ARGN}) - unset(PROTO_SRC_OPTIONS) - get_source_file_property(PROTO_SRC_OPTIONS ${PROTO_SRC} COMPILE_OPTIONS) - if(PROTO_SRC_OPTIONS) - list(APPEND PROTO_SRC_OPTIONS ${PATCH_PROTOBUF_SOURCES_OPTIONS}) - else() - set(PROTO_SRC_OPTIONS ${PATCH_PROTOBUF_SOURCES_OPTIONS}) - endif() - - set_source_files_properties( - ${PROTO_SRC} PROPERTIES COMPILE_OPTIONS "${PROTO_SRC_OPTIONS}") - endforeach() - unset(PROTO_SRC) - unset(PROTO_SRC_OPTIONS) - endif() -endfunction() - -function(patch_protobuf_targets) - if(PATCH_PROTOBUF_SOURCES_OPTIONS) - foreach(PROTO_TARGET ${ARGN}) - unset(PROTO_TARGET_OPTIONS) - get_target_property(PROTO_TARGET_OPTIONS ${PROTO_TARGET} COMPILE_OPTIONS) - if(PROTO_TARGET_OPTIONS) - list(APPEND PROTO_TARGET_OPTIONS ${PATCH_PROTOBUF_SOURCES_OPTIONS}) - else() - set(PROTO_TARGET_OPTIONS ${PATCH_PROTOBUF_SOURCES_OPTIONS}) - endif() - - set_target_properties( - ${PROTO_TARGET} PROPERTIES COMPILE_OPTIONS "${PROTO_TARGET_OPTIONS}") - endforeach() - unset(PROTO_TARGET) - unset(PROTO_TARGET_OPTIONS) - endif() -endfunction() - -function(project_build_tools_get_imported_location OUTPUT_VAR_NAME TARGET_NAME) - if(CMAKE_BUILD_TYPE) - string(TOUPPER "IMPORTED_LOCATION_${CMAKE_BUILD_TYPE}" - TRY_SPECIFY_IMPORTED_LOCATION) - get_target_property(${OUTPUT_VAR_NAME} ${TARGET_NAME} - ${TRY_SPECIFY_IMPORTED_LOCATION}) - endif() - if(NOT ${OUTPUT_VAR_NAME}) - get_target_property(${OUTPUT_VAR_NAME} ${TARGET_NAME} IMPORTED_LOCATION) - endif() - if(NOT ${OUTPUT_VAR_NAME}) - get_target_property( - project_build_tools_get_imported_location_IMPORTED_CONFIGURATIONS - ${TARGET_NAME} IMPORTED_CONFIGURATIONS) - foreach( - project_build_tools_get_imported_location_IMPORTED_CONFIGURATION IN - LISTS project_build_tools_get_imported_location_IMPORTED_CONFIGURATIONS) - get_target_property( - ${OUTPUT_VAR_NAME} - ${TARGET_NAME} - "IMPORTED_LOCATION_${project_build_tools_get_imported_location_IMPORTED_CONFIGURATION}" - ) - if(${OUTPUT_VAR_NAME}) - break() - endif() - endforeach() - endif() - if(${OUTPUT_VAR_NAME}) - set(${OUTPUT_VAR_NAME} - ${${OUTPUT_VAR_NAME}} - PARENT_SCOPE) - endif() -endfunction() diff --git a/conanfile.py b/conanfile.py index 8c0939e68..885d9a97d 100644 --- a/conanfile.py +++ b/conanfile.py @@ -6,18 +6,18 @@ class Pktvisor(ConanFile): generators = "CMakeToolchain", "CMakeDeps" def requirements(self): - self.requires("catch2/3.6.0") + self.requires("catch2/3.7.1") self.requires("corrade/2020.06") - self.requires("cpp-httplib/0.16.0") + self.requires("cpp-httplib/0.17.3") self.requires("docopt.cpp/0.6.3") self.requires("fast-cpp-csv-parser/cci.20240102") self.requires("json-schema-validator/2.3.0") self.requires("libmaxminddb/1.10.0") self.requires("nlohmann_json/3.11.3") - self.requires("openssl/3.3.1") + self.requires("openssl/3.3.2") if self.settings.os != "Windows": self.requires("libpcap/1.10.4", force=True) - self.requires("opentelemetry-proto/1.3.0") + self.requires("opentelemetry-cpp/1.14.2") self.requires("pcapplusplus/23.09") self.requires("abseil/20240116.2", force=True) self.requires("protobuf/5.27.0") @@ -26,7 +26,7 @@ def requirements(self): self.requires("uvw/3.4.0") self.requires("yaml-cpp/0.8.0") self.requires("robin-hood-hashing/3.11.5") - self.requires("libcurl/8.9.1") + self.requires("libcurl/8.10.1") self.requires("sentry-crashpad/0.6.5") def build_requirements(self): diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 66f7e1fcd..b0405add7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,13 +13,6 @@ find_package(spdlog REQUIRED) find_package(yaml-cpp REQUIRED) find_package(Catch2 REQUIRED) -#generate cpp code from opentelemetry-proto -find_program(PROTOBUF_PROTOC_EXECUTABLE NAMES protoc PATHS ${CONAN_BIN_DIRS_PROTOBUF}) -set(OTELCPP_PROTO_PATH ${CONAN_OPENTELEMETRY-PROTO_ROOT}/res) -set(BUILD_SHARED_LIBS FALSE) -include(opentelemetry-tools) -include(opentelemetry-proto) - add_library(visor-core AbstractModule.cpp AbstractPlugin.cpp