diff options
author | Jan Tattermusch <jtattermusch@google.com> | 2017-08-23 16:05:43 +0200 |
---|---|---|
committer | Jan Tattermusch <jtattermusch@google.com> | 2017-08-23 16:17:00 +0200 |
commit | 07d2092c79147c4b01b03589105847535e10f533 (patch) | |
tree | b3370498b3cfba8b8f0575aa6181a2dbe1367f09 | |
parent | a8003e8b968cf2ee88122c52d5c15c3f2ae9ca95 (diff) |
vs2017 build fixes
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | templates/CMakeLists.txt.template | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b593a9ae5..fb5701148b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,6 +91,8 @@ if (MSVC) add_definitions(/wd4065 /wd4506) # TODO(jtattermusch): revisit C4267 occurrences throughout the code add_definitions(/wd4267) + # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later + add_definitions(/wd4987 /wd4774 /wd4819 /wd4996 /wd4619) endif() if (gRPC_USE_PROTO_LITE) diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template index 850404baad..f9e9f846f9 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template @@ -136,6 +136,8 @@ add_definitions(/wd4065 /wd4506) # TODO(jtattermusch): revisit C4267 occurrences throughout the code add_definitions(/wd4267) + # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later + add_definitions(/wd4987 /wd4774 /wd4819 /wd4996 /wd4619) endif() if (gRPC_USE_PROTO_LITE) |