diff options
author | Gil <mcg@google.com> | 2018-07-11 19:32:24 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-11 19:32:24 -0700 |
commit | 49f2493e14cd68ecc0e08ad2d9fc75739e419a3b (patch) | |
tree | 1efb74a4526545ce5514cbe4d5a0a778ed1adbae /cmake/external | |
parent | 09c75c4fb8269d74ccfdfaccb36ea9f7519efdb5 (diff) |
Convert the gRPC external build to use an HTTP download (#1520)
* Add a download-only boringssl ExternalProject
Match boringssl version to grpc submodule version
* Split grpc into separate download and build tasks
This allows other external targets to download into the gRPC source tree
before grpc is actually built.
* Convert grpc to an http download
Diffstat (limited to 'cmake/external')
-rw-r--r-- | cmake/external/boringssl.cmake | 46 | ||||
-rw-r--r-- | cmake/external/grpc.cmake | 45 |
2 files changed, 76 insertions, 15 deletions
diff --git a/cmake/external/boringssl.cmake b/cmake/external/boringssl.cmake new file mode 100644 index 0000000..4463ba8 --- /dev/null +++ b/cmake/external/boringssl.cmake @@ -0,0 +1,46 @@ +# Copyright 2018 Google +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +include(ExternalProject) + +if(TARGET boringssl) + return() +endif() + +# This ExternalProject unpacks itself inside the gRPC source tree. CMake clears +# the SOURCE_DIR when unpacking so this must come after grpc despite the fact +# that grpc logically depends upon this. + +# This matches grpc at v1.8.3: +# https://github.com/grpc/grpc/tree/v1.8.3/third_party +set(commit be2ee342d3781ddb954f91f8a7e660c6f59e87e5) + +ExternalProject_Add( + boringssl + DEPENDS + grpc-download + + DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR} + DOWNLOAD_NAME boringssl-${commit}.tar.gz + URL https://github.com/google/boringssl/archive/${commit}.tar.gz + URL_HASH SHA256=8b9f399b8948ab36d51b5b979b208fdf4197e244a516e08d3ed3a9fbb387d463 + + PREFIX ${PROJECT_BINARY_DIR} + SOURCE_DIR ${PROJECT_BINARY_DIR}/src/grpc/third_party/boringssl + + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" + TEST_COMMAND "" +) diff --git a/cmake/external/grpc.cmake b/cmake/external/grpc.cmake index d35eb15..310d238 100644 --- a/cmake/external/grpc.cmake +++ b/cmake/external/grpc.cmake @@ -13,7 +13,6 @@ # limitations under the License. include(ExternalProject) -include(ExternalProjectFlags) include(external/c-ares) include(external/protobuf) include(external/zlib) @@ -30,14 +29,10 @@ if(GRPC_ROOT) endif() set( - GIT_SUBMODULES - third_party/boringssl -) - -set( CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DBUILD_SHARED_LIBS:BOOL=OFF + -DgRPC_INSTALL:BOOL=OFF -DgRPC_BUILD_TESTS:BOOL=OFF # TODO(rsgowman): We're currently building nanopb twice; once via grpc, and @@ -105,23 +100,43 @@ if(ZLIB_FOUND) endif() -ExternalProject_GitSource( - GRPC_GIT - GIT_REPOSITORY "https://github.com/grpc/grpc.git" - GIT_TAG "v1.8.3" - GIT_SUBMODULES ${GIT_SUBMODULES} -) - ExternalProject_Add( - grpc + grpc-download DEPENDS c-ares protobuf zlib - ${GRPC_GIT} + DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR} + DOWNLOAD_NAME grpc-1.8.3.tar.gz + URL https://github.com/grpc/grpc/archive/v1.8.3.tar.gz + URL_HASH SHA256=c14bceddc6475a09927a815811a8161cdfa7acb445262835da6bc24da9842c92 + + PREFIX ${PROJECT_BINARY_DIR} + SOURCE_DIR ${PROJECT_BINARY_DIR}/src/grpc + + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + TEST_COMMAND "" + INSTALL_COMMAND "" +) + +# gRPC depends upon these projects, so from an IWYU point of view should +# include these files. Unfortunately gRPC's build requires these to be +# subdirectories in its own source tree and CMake's ExternalProject download +# step clears the source tree so these must be declared to depend upon the grpc +# target. ExternalProject dependencies must already exist when declared so +# these must come after the ExternalProject_Add block above. +include(external/boringssl) + +ExternalProject_Add( + grpc + DEPENDS + boringssl + grpc-download PREFIX ${PROJECT_BINARY_DIR} + SOURCE_DIR ${PROJECT_BINARY_DIR}/src/grpc CMAKE_ARGS ${CMAKE_ARGS} |