Skip to content

Commit

Permalink
Don't invoke vcpkg from this repo with CMAKE_TOOLCHAIN_FILE set (#2527)
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomsonTan authored Feb 10, 2024
1 parent 6e8f7c4 commit 4700e48
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -573,9 +573,16 @@ if(BUILD_TESTING)
# Make sure we are always bootsrapped with vcpkg on Windows
find_package(GTest)
if(NOT (GTEST_FOUND OR GTest_FOUND))
install_windows_deps()
include(${CMAKE_TOOLCHAIN_FILE})
find_package(GTest REQUIRED)
if(DEFINED CMAKE_TOOLCHAIN_FILE)
message(
FATAL_ERROR
"Pleaes install GTest with the CMAKE_TOOLCHAIN_FILE at ${CMAKE_TOOLCHAIN_FILE}"
)
else()
install_windows_deps()
include(${CMAKE_TOOLCHAIN_FILE})
find_package(GTest REQUIRED)
endif()
endif()
else()
# Prefer GTest installed by OS distro, brew or vcpkg package manager
Expand Down

2 comments on commit 4700e48

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'OpenTelemetry-cpp api Benchmark'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.

Benchmark suite Current: 4700e48 Previous: 6e8f7c4 Ratio
BM_ProcYieldSpinLockThrashing/1/process_time/real_time 0.26029814520270034 ms/iter 0.07757912488349686 ms/iter 3.36
BM_ThreadYieldSpinLockThrashing/1/process_time/real_time 16.740012168884277 ms/iter 8.122381411100688 ms/iter 2.06

This comment was automatically generated by workflow using github-action-benchmark.

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'OpenTelemetry-cpp sdk Benchmark'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.

Benchmark suite Current: 4700e48 Previous: 6e8f7c4 Ratio
BM_SpanCreation 1255.602326786299 ns/iter 592.3693704066662 ns/iter 2.12

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.