From d03050653ff84e624def93aa512ef35907f5792a Mon Sep 17 00:00:00 2001
From: Gil <mcg@google.com>
Date: Tue, 26 Jun 2018 14:57:40 -0700
Subject: Install googletest (#1461)

Also add FindGMock to Find gmock after installation
---
 Firestore/CMakeLists.txt                              | 19 ++-----------------
 .../core/test/firebase/firestore/util/CMakeLists.txt  |  2 +-
 Firestore/third_party/abseil-cpp/CMakeLists.txt       | 12 ++++++------
 3 files changed, 9 insertions(+), 24 deletions(-)

(limited to 'Firestore')

diff --git a/Firestore/CMakeLists.txt b/Firestore/CMakeLists.txt
index 8b6f9d5..1240a8d 100644
--- a/Firestore/CMakeLists.txt
+++ b/Firestore/CMakeLists.txt
@@ -77,23 +77,8 @@ set(FIREBASE_BINARY_DIR ${PROJECT_BINARY_DIR}/..)
 list(INSERT CMAKE_MODULE_PATH 0 ${FIREBASE_SOURCE_DIR}/cmake)
 include(utils)
 
-# Include GoogleTest directly in the build.
-set(gtest_dir ${FIREBASE_BINARY_DIR}/external/googletest)
-add_subdirectory(
-  ${gtest_dir}/src/googletest
-  ${gtest_dir}/src/googletest-build
-  EXCLUDE_FROM_ALL
-)
-
-# Set up aliases with the same names as available via FindGTest.
-add_library(
-  GTest::GTest ALIAS gtest
-)
-
-add_library(
-  GTest::Main ALIAS gtest_main
-)
-
+find_package(GTest REQUIRED)
+find_package(GMock REQUIRED)
 find_package(LevelDB REQUIRED)
 find_package(GRPC REQUIRED)
 find_package(Nanopb REQUIRED)
diff --git a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
index 0345f7c..45245ff 100644
--- a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
+++ b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
@@ -137,7 +137,7 @@ cc_test(
     absl_base
     absl_strings
     firebase_firestore_util
-    gmock
+    GMock::GMock
 )
 
 if(APPLE)
diff --git a/Firestore/third_party/abseil-cpp/CMakeLists.txt b/Firestore/third_party/abseil-cpp/CMakeLists.txt
index 7318cd3..4b939fa 100644
--- a/Firestore/third_party/abseil-cpp/CMakeLists.txt
+++ b/Firestore/third_party/abseil-cpp/CMakeLists.txt
@@ -76,14 +76,14 @@ endif()
 
 ## check targets
 if(BUILD_TESTING)
-  check_target(gtest)
-  check_target(gtest_main)
-  check_target(gmock)
+  check_target(GTest::GTest)
+  check_target(GTest::Main)
+  check_target(GMock::GMock)
 
   list(APPEND ABSL_TEST_COMMON_LIBRARIES
-    gtest_main
-    gtest
-    gmock
+    GTest::GTest
+    GTest::Main
+    GMock::GMock
     ${CMAKE_THREAD_LIBS_INIT}
   )
 endif()
-- 
cgit v1.2.3