Skip to content

Commit b71bab5

Browse files
committed
debug mac issue
1 parent 7cdbe78 commit b71bab5

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.github/workflows/debug_mac_dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
working-directory: opentelemetry-matlab
2626
run: |
2727
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_OTLP_GRPC=ON -DWITH_OTLP_FILE=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
28-
cmake --build build --config Release --target install
28+
cmake --build build --config Release --target install -v
2929
- name: Compress into single artifact
3030
working-directory: ${{ github.workspace }}
3131
run: tar -czf otel-matlab-macos.tar.gz otel_matlab_install

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,9 +446,11 @@ else()
446446
if(APPLE)
447447
set(OTEL_CPP_RUNTIME ${OTEL_CPP_RUNTIME} $<TARGET_FILE:ZLIB::ZLIB>
448448
$<TARGET_FILE_DIR:ZLIB::ZLIB>/libz.${ZLIB_MAJOR_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}
449-
$<TARGET_FILE_DIR:ZLIB::ZLIB>/libz.${ZLIB_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}
450-
$<TARGET_FILE_DIR:OpenSSL::SSL>/libssl.3${CMAKE_SHARED_LIBRARY_SUFFIX}
449+
$<TARGET_FILE_DIR:ZLIB::ZLIB>/libz.${ZLIB_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
450+
if(WITH_OTLP_GRPC)
451+
set(OTEL_CPP_RUNTIME ${OTEL_CPP_RUNTIME} $<TARGET_FILE_DIR:OpenSSL::SSL>/libssl.3${CMAKE_SHARED_LIBRARY_SUFFIX}
451452
$<TARGET_FILE_DIR:OpenSSL::Crypto>/libcrypto.3${CMAKE_SHARED_LIBRARY_SUFFIX})
453+
endif()
452454
endif()
453455
set(OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES ${OTEL_CPP_RUNTIME})
454456
endif()

vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
]
2626
}
2727
},
28-
"builtin-baseline": "638b1588be3a265a9c7ad5b212cef72a1cad336a"
28+
"builtin-baseline": "b02e341c927f16d991edbd915d8ea43eac52096c"
2929
}

0 commit comments

Comments
 (0)