diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-02-26T15·05+0000 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-02-26T15·05+0000 |
| commit | 7166b3dd23b855047daafd57bdcd4edf452bd446 (patch) | |
| tree | 4b8dcb6bd4bf79ce89a43dd75134d4667839c189 | |
| parent | 4bdb118d6e9fe02effa9199f48796dcec04a24b0 (diff) | |
fix(3p/cpp/googleapis): Use googleapis proto files provided by Nix r/582
Updates the build process for googleapis in C++ to read the proto sources from the GOOGLEAPIS_DIR environment variable (injected by Nix) instead of attempting to download them at build time.
| -rw-r--r-- | third_party/cpp/googleapis/CMakeLists.txt | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/third_party/cpp/googleapis/CMakeLists.txt b/third_party/cpp/googleapis/CMakeLists.txt index f755def48404..a48f0effcd7c 100644 --- a/third_party/cpp/googleapis/CMakeLists.txt +++ b/third_party/cpp/googleapis/CMakeLists.txt @@ -36,14 +36,6 @@ string( set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) -# Give application developers a hook to configure the version and hash -# downloaded from GitHub. -set(GOOGLE_CLOUD_CPP_GOOGLEAPIS_URL - "https://github.com/googleapis/googleapis/archive/0b1876b35e98f560f9c9ca9797955f020238a092.tar.gz" -) -set(GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256 - "4b0db7279ddf0b9ec6a39fd741ef4694b20025fe38f7d98f1ab1ba224c417c2d") - set(GOOGLEAPIS_CPP_SOURCE "${CMAKE_BINARY_DIR}/external/googleapis/src/googleapis_download") @@ -110,8 +102,7 @@ ExternalProject_Add( googleapis_download EXCLUDE_FROM_ALL ON PREFIX "${CMAKE_BINARY_DIR}/external/googleapis" - URL ${GOOGLE_CLOUD_CPP_GOOGLEAPIS_URL} - URL_HASH SHA256=${GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256} + URL $ENV{GOOGLEAPIS_DIR} CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" |