diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2016-04-11 23:37:42 -0700 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2016-04-11 23:37:42 -0700 |
| commit | 814685ca2cd9280ca401e1842fd6311440921a0a (patch) | |
| tree | 5c2cac2b5ba07fe345fdda74c270b32c8f7b9331 /cmake | |
| parent | 3ffbdd712f0413ce4964d626c5e10533f1f74893 (diff) | |
| parent | 3c4ce528c63f4dc39d15de963020472980ee7229 (diff) | |
| download | protobuf-814685ca2cd9280ca401e1842fd6311440921a0a.tar.gz protobuf-814685ca2cd9280ca401e1842fd6311440921a0a.tar.bz2 protobuf-814685ca2cd9280ca401e1842fd6311440921a0a.zip | |
Merge pull request #1397 from google/internal-merge
Internal merge
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 15ae457a..f32a0e4e 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -118,6 +118,8 @@ if (MSVC) # Build with multiple processes add_definitions(/MP) add_definitions(/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305) + # Allow big object + add_definitions(/bigobj) string(REPLACE "/" "\\" PROTOBUF_SOURCE_WIN32_PATH ${protobuf_SOURCE_DIR}) string(REPLACE "/" "\\" PROTOBUF_BINARY_WIN32_PATH ${protobuf_BINARY_DIR}) configure_file(extract_includes.bat.in extract_includes.bat) |