File tree Expand file tree Collapse file tree 3 files changed +5
-4
lines changed Expand file tree Collapse file tree 3 files changed +5
-4
lines changed Original file line number Diff line number Diff line change 56
56
shell : cmd
57
57
run : |
58
58
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
59
- cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DWITH_OTLP_GRPC=ON -DUSE_BATCH_FOR_MCC=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
59
+ cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DWITH_OTLP_GRPC=ON -DUSE_BATCH_FOR_MCC=ON -DFETCH_VCPKG - DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
60
60
cmake --build build --config Release --target install
61
61
- name : Run tests
62
62
env :
Original file line number Diff line number Diff line change 54
54
shell : cmd
55
55
run : |
56
56
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
57
- cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DWITH_OTLP_GRPC=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
57
+ cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DWITH_OTLP_GRPC=ON -DFETCH_VCPKG - DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
58
58
cmake --build build --config Release --target install
59
59
- name : Compress into single artifact
60
60
working-directory : ${{ github.workspace }}
Original file line number Diff line number Diff line change @@ -10,15 +10,16 @@ cmake_policy(SET CMP0074 NEW)
10
10
include (FetchContent )
11
11
12
12
# check if VCPKG_ROOT is defined, which should point to an existing installation
13
- if (DEFINED ENV{VCPKG_ROOT} )
13
+ # FETCH_VCPKG is a switch that can be defined to ignore VCPKG_ROOT
14
+ if (DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED FETCH_VCPKG )
14
15
# Autodetect vcpkg toolchain
15
16
if (NOT DEFINED CMAKE_TOOLCHAIN_FILE )
16
17
string (REPLACE "\\ " "/" CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT} /scripts/buildsystems/vcpkg.cmake" )
17
18
endif ()
18
19
else ()
19
20
# VCPKG_ROOT not defined, get it using FetchContent
20
21
21
- if (DEFINED VCPKG_PREFIX} )
22
+ if (DEFINED VCPKG_PREFIX )
22
23
# download location specified
23
24
string (REPLACE "\\ " "/" VCPKG_PREFIX "${VCPKG_PREFIX} " )
24
25
else ()
You can’t perform that action at this time.
0 commit comments