diff --git a/ports/telemetry/opentelemetry-cpp-v1.18.patch b/ports/telemetry/opentelemetry-cpp-v1.18.patch new file mode 100644 index 0000000..4af0186 --- /dev/null +++ b/ports/telemetry/opentelemetry-cpp-v1.18.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 177296d..9df246b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -306,6 +306,14 @@ if(WITH_EXAMPLES_HTTP AND NOT WITH_EXAMPLES) + endif() + + find_package(Threads) ++find_package(ZLIB QUIET) ++find_package(zstd QUIET) ++find_package(c-ares QUIET) ++find_package(OpenSSL QUIET) ++find_package(MbedTLS QUIET) ++find_package(Libnghttp3 QUIET) ++find_package(Libngtcp2 QUIET) ++find_package(Libnghttp2 QUIET) + + function(install_windows_deps) + # Bootstrap vcpkg from CMake and auto-install deps in case if we are missing diff --git a/ports/telemetry/opentelemetry-cpp.cmake b/ports/telemetry/opentelemetry-cpp.cmake index 9ab2ed1..658cfd5 100644 --- a/ports/telemetry/opentelemetry-cpp.cmake +++ b/ports/telemetry/opentelemetry-cpp.cmake @@ -37,7 +37,7 @@ if(NOT TARGET opentelemetry-cpp::api AND NOT TARGET opentelemetry-cpp::sdk) if(NOT TARGET opentelemetry-cpp::api AND NOT TARGET opentelemetry-cpp::sdk) unset(ATFRAMEWORK_CMAKE_TOOLSET_THIRD_PARTY_OPENTELEMETRY_CPP_INCLUDE_DIRECTORIES) - project_third_party_port_declare(opentelemetry_cpp VERSION "v1.17.0" GIT_URL + project_third_party_port_declare(opentelemetry_cpp VERSION "v1.18.0" GIT_URL "https://github.com/open-telemetry/opentelemetry-cpp.git") project_third_party_try_patch_file( diff --git a/ports/telemetry/prometheus-cpp-v1.3.patch b/ports/telemetry/prometheus-cpp-v1.3.patch new file mode 100644 index 0000000..3c4d48c --- /dev/null +++ b/ports/telemetry/prometheus-cpp-v1.3.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 949c146..1d85bae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -127,6 +127,20 @@ endif() + add_subdirectory(core) + add_subdirectory(util) + ++if(ENABLE_PULL OR ENABLE_PUSH) ++ find_package(Threads) ++ find_package(ZLIB QUIET) ++ find_package(zstd QUIET) ++ find_package(c-ares QUIET) ++ find_package(Libnghttp3 QUIET) ++ find_package(Libngtcp2 QUIET) ++ find_package(Libnghttp2 QUIET) ++ if(THIRDPARTY_CIVETWEB_WITH_SSL) ++ find_package(OpenSSL QUIET) ++ find_package(MbedTLS QUIET) ++ endif() ++endif() ++ + if(ENABLE_PULL) + add_subdirectory(pull) + endif() +diff --git a/push/CMakeLists.txt b/push/CMakeLists.txt +index f6110b1..380fb0f 100644 +--- a/push/CMakeLists.txt ++++ b/push/CMakeLists.txt +@@ -1,4 +1,9 @@ + ++find_package(zstd QUIET) ++find_package(c-ares QUIET) ++find_package(Libnghttp3 QUIET) ++find_package(Libngtcp2 QUIET) ++find_package(Libnghttp2 QUIET) + find_package(CURL REQUIRED) + + add_library(push diff --git a/ports/telemetry/prometheus-cpp.cmake b/ports/telemetry/prometheus-cpp.cmake index d3b413e..f2db9d4 100644 --- a/ports/telemetry/prometheus-cpp.cmake +++ b/ports/telemetry/prometheus-cpp.cmake @@ -48,7 +48,7 @@ if(NOT TARGET prometheus-cpp::core) ${ATFRAMEWORK_CMAKE_TOOLSET_THIRD_PARTY_PROMETHEUS_CPP_APPEND_DEFAULT_BUILD_OPTIONS}) endif() endif() - project_third_party_port_declare(prometheus_cpp VERSION "v1.2.4" GIT_URL + project_third_party_port_declare(prometheus_cpp VERSION "v1.3.0" GIT_URL "https://github.com/jupp0r/prometheus-cpp.git") project_third_party_try_patch_file( ATFRAMEWORK_CMAKE_TOOLSET_THIRD_PARTY_PROMETHEUS_CPP_PATCH_FILE "${CMAKE_CURRENT_LIST_DIR}" "prometheus-cpp"