Merge branch 'main' into fix-msvc-library-selection

open-telemetry · Jun 6, 2024 · 3ff8b97 · 3ff8b97
2 parents dcb26a6 + bf8fa53
commit 3ff8b97
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 57 deletions.
diff --git a/ci/ports/benchmark/portfile.cmake b/ci/ports/benchmark/portfile.cmake
diff --git a/ci/ports/benchmark/vcpkg.json b/ci/ports/benchmark/vcpkg.json
diff --git a/ci/setup_windows_ci_environment.ps1 b/ci/setup_windows_ci_environment.ps1
@@ -10,8 +10,8 @@ $VCPKG_DIR = (Get-Item -Path ".\").FullName
 ./bootstrap-vcpkg.bat
 ./vcpkg integrate install
 
-# Patched Google Benchmark can be shared between vs2017 and vs2019 compilers
-./vcpkg "--vcpkg-root=$VCPKG_DIR" install --overlay-ports="$PSScriptRoot\ports" benchmark:x64-windows
+# Google Benchmark
+./vcpkg "--vcpkg-root=$VCPKG_DIR" install benchmark:x64-windows
 
 # Google Test
 ./vcpkg "--vcpkg-root=$VCPKG_DIR" install gtest:x64-windows