From 6c3772145c694f3a0b4516b215769c707270d8a4 Mon Sep 17 00:00:00 2001 From: duncanpo Date: Wed, 24 Sep 2025 13:37:14 -0400 Subject: [PATCH] Update OpenSSL to be compatible with cmake 4.0 on Mac --- .github/workflows/build_and_test_full.yml | 2 ++ .github/workflows/create_release.yml | 2 ++ CMakeLists.txt | 2 +- vcpkg.json | 5 ++++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test_full.yml b/.github/workflows/build_and_test_full.yml index 296fa05..a2918d6 100644 --- a/.github/workflows/build_and_test_full.yml +++ b/.github/workflows/build_and_test_full.yml @@ -148,6 +148,8 @@ jobs: products: MATLAB_Compiler MATLAB_Compiler_SDK - name: Build OpenTelemetry-Matlab working-directory: opentelemetry-matlab + env: + CMAKE_POLICY_VERSION_MINIMUM: 3.5 # required by upb because its cmake requirement is not compatible with cmake 4 run: | cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DWITH_OTLP_GRPC=ON -DUSE_BATCH_FOR_MCC=ON -DOTEL_MATLAB_VERSION=${{ needs.get_version.outputs.version }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} cmake --build build --config Release --target install diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index d9a4557..f4f17aa 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -85,6 +85,8 @@ jobs: products: MATLAB_Compiler - name: Build OpenTelemetry-Matlab working-directory: opentelemetry-matlab + env: + CMAKE_POLICY_VERSION_MINIMUM: 3.5 # required by upb because its cmake requirement is not compatible with cmake 4 run: | cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_OTLP_GRPC=ON -DWITH_OTLP_FILE=ON -DOTEL_MATLAB_VERSION=${{ github.ref_name }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} cmake --build build --config Release --target install diff --git a/CMakeLists.txt b/CMakeLists.txt index e02c2c9..04b78cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ else() set(VCPKG_FETCH_CONTENT_NAME vcpkg) set(VCPKG_GIT_REPOSITORY "https://github.com/microsoft/vcpkg.git") - set(VCPKG_GIT_TAG "b02e341") + set(VCPKG_GIT_TAG "ce613c4") FetchContent_Declare( ${VCPKG_FETCH_CONTENT_NAME} GIT_REPOSITORY ${VCPKG_GIT_REPOSITORY} diff --git a/vcpkg.json b/vcpkg.json index a295500..a45c1fd 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -20,7 +20,10 @@ "abseil", "c-ares", "re2", - "openssl", + { + "name": "openssl", + "version>=": "3.5.0" + }, "upb" ] }