Skip to content

Commit

Permalink
[BUILD] Remove gmock from GTEST_BOTH_LIBRARIES (#2437)
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomsonTan authored Dec 7, 2023
1 parent 4bd64c9 commit a8b11a3
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -578,12 +578,10 @@ if(BUILD_TESTING)
${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest/googletest/include
${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest/googlemock/include)
if(TARGET gtest)
set(GTEST_BOTH_LIBRARIES gtest gtest_main gmock)
set(GTEST_BOTH_LIBRARIES gtest gtest_main)
else()
set(GTEST_BOTH_LIBRARIES
${CMAKE_BINARY_DIR}/lib/libgtest.a
${CMAKE_BINARY_DIR}/lib/libgtest_main.a
${CMAKE_BINARY_DIR}/lib/libgmock.a)
set(GTEST_BOTH_LIBRARIES ${CMAKE_BINARY_DIR}/lib/libgtest.a
${CMAKE_BINARY_DIR}/lib/libgtest_main.a)
endif()
elseif(WIN32)
# Make sure we are always bootsrapped with vcpkg on Windows
Expand All @@ -600,7 +598,7 @@ if(BUILD_TESTING)
if(NOT GTEST_BOTH_LIBRARIES)
# New GTest package names
if(TARGET GTest::gtest)
set(GTEST_BOTH_LIBRARIES GTest::gtest GTest::gtest_main GTest::gmock)
set(GTEST_BOTH_LIBRARIES GTest::gtest GTest::gtest_main)
elseif(TARGET GTest::GTest)
set(GTEST_BOTH_LIBRARIES GTest::GTest GTest::Main)
endif()
Expand Down

1 comment on commit a8b11a3

@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: a8b11a3 Previous: 4bd64c9 Ratio
BM_BaselineBuffer/1 5925152.30178833 ns/iter 568051.5766143799 ns/iter 10.43
BM_LockFreeBuffer/4 4599162.019216097 ns/iter 1091034.1516137123 ns/iter 4.22

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

Please sign in to comment.