From 1641a0d791719c8e0e1fe206e067b4842ca657d2 Mon Sep 17 00:00:00 2001 From: Marek Gilbert Date: Wed, 6 Dec 2017 09:23:03 -0800 Subject: Consume googletest in the standard CMake way --- Firestore/third_party/abseil-cpp/CMakeLists.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'Firestore/third_party') diff --git a/Firestore/third_party/abseil-cpp/CMakeLists.txt b/Firestore/third_party/abseil-cpp/CMakeLists.txt index e87f4a8..0da6c42 100644 --- a/Firestore/third_party/abseil-cpp/CMakeLists.txt +++ b/Firestore/third_party/abseil-cpp/CMakeLists.txt @@ -53,15 +53,17 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_WARNING_VLA} ${CMAKE_CXX_FLAGS} ") ## pthread find_package(Threads REQUIRED) +find_package(GTest REQUIRED) + # commented: used only for standalone test #add_subdirectory(cctz) #add_subdirectory(googletest) ## check targets -check_target(cctz) -check_target(gtest) -check_target(gtest_main) -check_target(gmock) +#check_target(cctz) +#check_target(gtest) +#check_target(gtest_main) +#check_target(gmock) # -fexceptions set(ABSL_EXCEPTIONS_FLAG "${CMAKE_CXX_EXCEPTIONS}") @@ -70,9 +72,9 @@ set(ABSL_EXCEPTIONS_FLAG "${CMAKE_CXX_EXCEPTIONS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FIX_MSVC} ${CMAKE_CXX_FLAGS}") list(APPEND ABSL_TEST_COMMON_LIBRARIES - gtest_main - gtest - gmock + GTest::Main + GTest::GTest + #GMock::GMock ${CMAKE_THREAD_LIBS_INIT} ) -- cgit v1.2.3