debug

mathworks · Jul 3, 2024 · 98fca1d · 98fca1d
1 parent 7204e68
commit 98fca1d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -58,7 +58,7 @@ jobs:
                  VERBOSE: "ON"
               run: |
                   call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
-                  cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DUSE_BATCH_FOR_MCC=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
+                  cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DUSE_BATCH_FOR_MCC=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }} -DVCPKG_TARGET_TRIPLET=x64-windows-otel-matlab
                   cmake --build build --config Release --target install -- -v
             - name: Run tests
               env:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -43,8 +43,8 @@ else()
        # On Windows, there is a conflict between abseil_dll.dll and the version used by Simulink. 
        # The shared library doesn't seem ABI stable and different versions cannot be used interchangeably. 
        # To sidestep the problem, use static library.
-       set(VCPKG_OVERLAY_TRIPLETS ${CMAKE_SOURCE_DIR}/cmake/vcpkg_triplets)
-       set(VCPKG_TARGET_TRIPLET x64-windows-otel-matlab)
+       set(VCPKG_OVERLAY_TRIPLETS ${CMAKE_SOURCE_DIR}/cmake/vcpkg_triplets CACHE STRING "")
+       set(VCPKG_TARGET_TRIPLET x64-windows-otel-matlab CACHE STRING "")
        set(TRIPLET_DEFINITIONS -DVCPKG_OVERLAY_TRIPLETS="${VCPKG_OVERLAY_TRIPLETS}" -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET})
    endif()