Merge branch 'main' into fix_ssl_preview_2383

open-telemetry · Dec 7, 2023 · cccf7c5 · cccf7c5
2 parents 862b728 + a8b11a3
commit cccf7c5
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -564,12 +564,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
@@ -586,7 +584,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()