diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-08-28 12:55:40 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-08-28 12:55:40 -0700 |
| commit | 6076b1d7982b4d0778dd68c236075b5c36b72e0d (patch) | |
| tree | 1da2c80065a6844ca0480bd83217792cc3185886 /cmake/ssl.cmake | |
| parent | 3f002567c4c1f8cc7542aeee2d60d6d0c4c5dd54 (diff) | |
| parent | 4b5b019d5644affef122e06c6898811286850b8d (diff) | |
Merge branch 'channelz-subchannels' into channelz-server
Diffstat (limited to 'cmake/ssl.cmake')
| -rw-r--r-- | cmake/ssl.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index 83f642a675..19a7d779b3 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -17,7 +17,14 @@ if("${gRPC_SSL_PROVIDER}" STREQUAL "module") set(BORINGSSL_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/boringssl) endif() if(EXISTS "${BORINGSSL_ROOT_DIR}/CMakeLists.txt") - set(OPENSSL_NO_ASM ON) # make boringssl buildable with Visual Studio + if (MSVC AND NOT CMAKE_GENERATOR STREQUAL "Ninja") + # Visual Studio build with assembly optimizations is broken, + # but it works with Ninja generator. + # This will get eventually fixed in cmake, but until then + # we need to disable assembly optimizations. + # See https://github.com/grpc/grpc/issues/16376 + set(OPENSSL_NO_ASM ON) + endif() add_subdirectory(${BORINGSSL_ROOT_DIR} third_party/boringssl) if(TARGET ssl) set(_gRPC_SSL_LIBRARIES ssl) |