aboutsummaryrefslogtreecommitdiffhomepage
path: root/Firestore
diff options
context:
space:
mode:
authorGravatar Gil <mcg@google.com>2018-06-26 14:57:40 -0700
committerGravatar GitHub <noreply@github.com>2018-06-26 14:57:40 -0700
commitd03050653ff84e624def93aa512ef35907f5792a (patch)
treecef0fb6ef7e28a3302e1578f83a8fd8d57099eba /Firestore
parentae7078ca2bdd362df43e5fdba0261c5c84c1b447 (diff)
Install googletest (#1461)
Also add FindGMock to Find gmock after installation
Diffstat (limited to 'Firestore')
-rw-r--r--Firestore/CMakeLists.txt19
-rw-r--r--Firestore/core/test/firebase/firestore/util/CMakeLists.txt2
-rw-r--r--Firestore/third_party/abseil-cpp/CMakeLists.txt12
3 files changed, 9 insertions, 24 deletions
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()