Skip to content

Commit

Permalink
Update typo and try assuming GoogleTest comes with legacy Protobuf.
Browse files Browse the repository at this point in the history
  • Loading branch information
EpsilonPrime committed Feb 21, 2024
1 parent 3482f23 commit 2f4a246
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@ find_package(Protobuf QUIET CONFIG)
if(${Protobuf_FOUND})
message(STATUS "Modern protobuf library located.")
set(ABSL_INCLUDED_WITH_PROTOBUF ON)
set(GOOGLTEST_INCLUDED_WITH_PROTOBUF OFF)
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(GOOGLTEST_INCLUDED_WITH_PROTOBUF OFF)
set(GOOGLETEST_INCLUDED_WITH_PROTOBUF ON)
else()
message(STATUS "Fetching external protobuf library.")
include(third_party/protobuf.cmake)
set(ABSL_INCLUDED_WITH_PROTOBUF ON)
set(GOOGLTEST_INCLUDED_WITH_PROTOBUF ON)
set(GOOGLETEST_INCLUDED_WITH_PROTOBUF ON)
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion third_party/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include(datetime.cmake)

add_subdirectory(fmt)

if(NOT ${GOOGLTEST_INCLUDED_WITH_PROTOBUF})
if(NOT ${GOOGLETEST_INCLUDED_WITH_PROTOBUF})
add_subdirectory(googletest)
endif()

Expand Down

0 comments on commit 2f4a246

Please sign in to comment.