From 1cc6672411938acbf84d690e9b97e05a19d8efb2 Mon Sep 17 00:00:00 2001
From: Tom Tan <Tom.Tan@microsoft.com>
Date: Wed, 6 Dec 2023 17:05:21 -0800
Subject: [PATCH 1/2] [BUILD] Remove gmock from GTEST_BOTH_LIBRARIES

---
 CMakeLists.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c27a910f4e..cdbd29fa3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -578,12 +578,11 @@ 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)
+          ${CMAKE_BINARY_DIR}/lib/libgtest_main.a)
     endif()
   elseif(WIN32)
     # Make sure we are always bootsrapped with vcpkg on Windows
@@ -600,7 +599,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()

From cb93e9c0f06d5c352096065eac99bcbb00edc49a Mon Sep 17 00:00:00 2001
From: Tom Tan <totan@microsoft.com>
Date: Wed, 6 Dec 2023 19:53:59 -0800
Subject: [PATCH 2/2] Fix format

---
 CMakeLists.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdbd29fa3c..c61925e97b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -580,9 +580,8 @@ if(BUILD_TESTING)
     if(TARGET gtest)
       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)
+      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