Skip to content

Commit 629ac15

Browse files
committed
ninja build
1 parent ca7cec2 commit 629ac15

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

.github/workflows/build_and_test.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ jobs:
4343
uses: actions/checkout@v3
4444
with:
4545
path: opentelemetry-matlab
46-
- name: Install ninja-build
47-
run: choco install ninja
4846
- name: Install MATLAB
4947
uses: matlab-actions/setup-matlab@v2
5048
with:

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ if(NOT DEFINED OTEL_CPP_INSTALLED_DIR)
186186
PREFIX ${OTEL_CPP_PREFIX}
187187
UPDATE_DISCONNECTED 1
188188
PATCH_COMMAND ${patch_command}
189-
CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DWITH_OTLP_HTTP=${WITH_OTLP_HTTP} -DWITH_OTLP_GRPC=${WITH_OTLP_GRPC} -DBUILD_TESTING=OFF -DWITH_BENCHMARK=OFF -DWITH_EXAMPLES=OFF -DWITH_FUNC_TESTS=OFF -DOPENTELEMETRY_INSTALL=ON -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_CXX_STANDARD=${OTEL_CPP_CXX_STANDARD} -DVCPKG_INSTALLED_DIR=${VCPKG_INSTALLED_DIR}
189+
CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DWITH_OTLP_HTTP=${WITH_OTLP_HTTP} -DWITH_OTLP_GRPC=${WITH_OTLP_GRPC} -DBUILD_TESTING=OFF -DWITH_BENCHMARK=OFF -DOPENTELEMETRY_INSTALL=ON -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_CXX_STANDARD=${OTEL_CPP_CXX_STANDARD} -DVCPKG_INSTALLED_DIR=${VCPKG_INSTALLED_DIR}
190190
BUILD_BYPRODUCTS ${OTEL_CPP_LIBRARIES}
191191
INSTALL_DIR ${OTEL_CPP_PREFIX}
192192
INSTALL_COMMAND ${CMAKE_COMMAND} --install . --prefix ${OTEL_CPP_PREFIX}

0 commit comments

Comments
 (0)