diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2017-02-27 08:50:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-27 08:50:32 -0800 |
| commit | d41c47fff992a7729a36ca61f8090aa40596e948 (patch) | |
| tree | 09e483b482e0826691667a12a95c455b8d1e07e5 | |
| parent | 8d61f9c3bf4ba1c1705fe773b820a60f44737246 (diff) | |
| parent | 37bd5d525b5caf8418e33591aff1613ac45034db (diff) | |
| download | protobuf-d41c47fff992a7729a36ca61f8090aa40596e948.tar.gz protobuf-d41c47fff992a7729a36ca61f8090aa40596e948.tar.bz2 protobuf-d41c47fff992a7729a36ca61f8090aa40596e948.zip | |
Merge pull request #2733 from wmamrak/patch-1
Disable MSVC warning C4309
| -rw-r--r-- | cmake/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index df3b2012..7618ba21 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -135,7 +135,7 @@ endif (protobuf_BUILD_SHARED_LIBS) if (MSVC) # Build with multiple processes add_definitions(/MP) - add_definitions(/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305) + add_definitions(/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 /wd4309) # Allow big object add_definitions(/bigobj) string(REPLACE "/" "\\" PROTOBUF_SOURCE_WIN32_PATH ${protobuf_SOURCE_DIR}) |