Merge pull request #23587 from jtattermusch/bad_bad_re2

Fix repeated builds broken by re2's cmake
pull/23700/head
Jan Tattermusch 4 years ago committed by GitHub
commit ebeed0c459
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      cmake/re2.cmake

@ -21,6 +21,9 @@ if(gRPC_RE2_PROVIDER STREQUAL "module")
set(RE2_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/re2) set(RE2_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/re2)
endif() endif()
if(EXISTS "${RE2_ROOT_DIR}/CMakeLists.txt") if(EXISTS "${RE2_ROOT_DIR}/CMakeLists.txt")
# Explicitly disable BUILD_TESTING to avoid re2's CMakeLists.txt triggering https://github.com/grpc/grpc/issues/23586
option(BUILD_TESTING "re2.cmake explicitly disabled CTest's BUILD_TESTING option." OFF)
include_directories("${RE2_ROOT_DIR}") include_directories("${RE2_ROOT_DIR}")
add_subdirectory(${RE2_ROOT_DIR} third_party/re2) add_subdirectory(${RE2_ROOT_DIR} third_party/re2)

Loading…
Cancel
Save