diff options
Diffstat (limited to 'tensorflow/contrib/cmake/external/grpc.cmake')
| -rw-r--r-- | tensorflow/contrib/cmake/external/grpc.cmake | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tensorflow/contrib/cmake/external/grpc.cmake b/tensorflow/contrib/cmake/external/grpc.cmake index d7201680ce..0740c38dd3 100644 --- a/tensorflow/contrib/cmake/external/grpc.cmake +++ b/tensorflow/contrib/cmake/external/grpc.cmake @@ -17,7 +17,7 @@ include (ExternalProject) set(GRPC_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/include) set(GRPC_URL https://github.com/grpc/grpc.git) set(GRPC_BUILD ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc) -set(GRPC_TAG 3bc78cd0b5bd784a235c01612d634b1ec5f8fb97) +set(GRPC_TAG 781fd6f6ea03645a520cd5c675da67ab61f87e4b) if(WIN32) set(grpc_STATIC_LIBRARIES @@ -38,7 +38,10 @@ ExternalProject_Add(grpc GIT_TAG ${GRPC_TAG} DOWNLOAD_DIR "${DOWNLOAD_LOCATION}" BUILD_IN_SOURCE 1 + # TODO(jhseu): Remove this PATCH_COMMAND once grpc removes the dependency + # on "grpc" from the "grpc++_unsecure" rule. PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/patches/grpc/CMakeLists.txt ${GRPC_BUILD} + BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release --target grpc++_unsecure INSTALL_COMMAND "" CMAKE_CACHE_ARGS -DCMAKE_BUILD_TYPE:STRING=Release @@ -46,5 +49,13 @@ ExternalProject_Add(grpc -DPROTOBUF_INCLUDE_DIRS:STRING=${PROTOBUF_INCLUDE_DIRS} -DPROTOBUF_LIBRARIES:STRING=${protobuf_STATIC_LIBRARIES} -DZLIB_ROOT:STRING=${ZLIB_INSTALL} + -DgRPC_SSL_PROVIDER:STRING=NONE ) +# grpc/src/core/ext/census/tracing.c depends on the existence of openssl/rand.h. +ExternalProject_Add_Step(grpc copy_rand + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_SOURCE_DIR}/patches/grpc/rand.h ${GRPC_BUILD}/include/openssl/rand.h + DEPENDEES patch + DEPENDERS build +) |