From f5a8780656b59a1ad3a650fcab8107c0f86ac0ae Mon Sep 17 00:00:00 2001 From: David Sisson Date: Wed, 21 Feb 2024 07:57:42 -0800 Subject: [PATCH] Try using find_package to find GTest instead of guessing. --- CMakeLists.txt | 3 --- third_party/CMakeLists.txt | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index add6770f..2c977ce3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,19 +41,16 @@ find_package(Protobuf QUIET CONFIG) if(${Protobuf_FOUND}) message(STATUS "Modern protobuf library located.") set(ABSL_INCLUDED_WITH_PROTOBUF ON) - set(GOOGLETEST_INCLUDED_WITH_PROTOBUF OFF) else() find_package(Protobuf QUIET) if(${Protobuf_FOUND}) message(STATUS "Legacy protobuf library located.") include_directories(${Protobuf_INCLUDE_DIRS}) set(ABSL_INCLUDED_WITH_PROTOBUF OFF) - set(GOOGLETEST_INCLUDED_WITH_PROTOBUF OFF) else() message(STATUS "Fetching external protobuf library.") include(third_party/protobuf.cmake) set(ABSL_INCLUDED_WITH_PROTOBUF ON) - set(GOOGLETEST_INCLUDED_WITH_PROTOBUF ON) endif() endif() diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index b421f1d8..06a0d740 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -9,7 +9,8 @@ include(datetime.cmake) add_subdirectory(fmt) -if(NOT ${GOOGLETEST_INCLUDED_WITH_PROTOBUF}) +find_package(GTest QUIET) +if(NOT ${GTEST_FOUND}) message(STATUS "Using bundled GoogleTest library.") add_subdirectory(googletest) endif()