From 04fd103ec72c8b24a445e8c04e38b32487b1791f Mon Sep 17 00:00:00 2001 From: Rahul Sheth Date: Thu, 13 Aug 2020 18:45:04 -0400 Subject: [PATCH] Try pulling new dependencies from hunter --- CMakeLists.txt | 4 ++-- cmake/abseil-cpp.cmake | 1 + cmake/re2.cmake | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee5dde542690c..3a77f2b1d38e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,8 +25,8 @@ cmake_minimum_required(VERSION 3.0) include(cmake/HunterGate.cmake) HunterGate( - URL "https://github.com/ruslo/hunter/archive/v0.23.80.tar.gz" - SHA1 "3bfa8be33ac3bdac570312ca1ece33059cc71c20" + URL "https://github.com/cpp-pm/hunter/archive/v0.23.264.tar.gz" + SHA1 "45ab668f0923fc3ace807a34d971e34ce7428dfd" LOCAL ) diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake index 078d495417fb2..7a7950d982393 100644 --- a/cmake/abseil-cpp.cmake +++ b/cmake/abseil-cpp.cmake @@ -35,6 +35,7 @@ if(gRPC_ABSL_PROVIDER STREQUAL "module") endif() elseif(gRPC_ABSL_PROVIDER STREQUAL "package") # Use "CONFIG" as there is no built-in cmake module for absl. + hunter_add_package(abseil) find_package(absl REQUIRED CONFIG) set(_gRPC_FIND_ABSL "if(NOT absl_FOUND)\n find_package(absl CONFIG)\nendif()") endif() diff --git a/cmake/re2.cmake b/cmake/re2.cmake index 383d64faa72e4..f36cd0bb09ea9 100644 --- a/cmake/re2.cmake +++ b/cmake/re2.cmake @@ -42,6 +42,7 @@ if(gRPC_RE2_PROVIDER STREQUAL "module") set(gRPC_INSTALL FALSE) endif() elseif(gRPC_RE2_PROVIDER STREQUAL "package") + hunter_add_package(re2) find_package(re2 REQUIRED CONFIG) if(TARGET re2::re2)