Skip to content

Commit 6c37721

Browse files
committed
Update OpenSSL to be compatible with cmake 4.0 on Mac
1 parent cc265eb commit 6c37721

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

.github/workflows/build_and_test_full.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ jobs:
148148
products: MATLAB_Compiler MATLAB_Compiler_SDK
149149
- name: Build OpenTelemetry-Matlab
150150
working-directory: opentelemetry-matlab
151+
env:
152+
CMAKE_POLICY_VERSION_MINIMUM: 3.5 # required by upb because its cmake requirement is not compatible with cmake 4
151153
run: |
152154
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 }}
153155
cmake --build build --config Release --target install

.github/workflows/create_release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ jobs:
8585
products: MATLAB_Compiler
8686
- name: Build OpenTelemetry-Matlab
8787
working-directory: opentelemetry-matlab
88+
env:
89+
CMAKE_POLICY_VERSION_MINIMUM: 3.5 # required by upb because its cmake requirement is not compatible with cmake 4
8890
run: |
8991
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 }}
9092
cmake --build build --config Release --target install

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ else()
2828

2929
set(VCPKG_FETCH_CONTENT_NAME vcpkg)
3030
set(VCPKG_GIT_REPOSITORY "https://github.com/microsoft/vcpkg.git")
31-
set(VCPKG_GIT_TAG "b02e341")
31+
set(VCPKG_GIT_TAG "ce613c4")
3232
FetchContent_Declare(
3333
${VCPKG_FETCH_CONTENT_NAME}
3434
GIT_REPOSITORY ${VCPKG_GIT_REPOSITORY}

vcpkg.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
"abseil",
2121
"c-ares",
2222
"re2",
23-
"openssl",
23+
{
24+
"name": "openssl",
25+
"version>=": "3.5.0"
26+
},
2427
"upb"
2528
]
2629
}

0 commit comments

Comments
 (0)