diff options
| author | Jisi Liu <liujisi@google.com> | 2016-04-01 17:22:58 -0700 |
|---|---|---|
| committer | Jisi Liu <liujisi@google.com> | 2016-04-01 17:22:58 -0700 |
| commit | aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5 (patch) | |
| tree | f7ce45e0922c46eecd01a36afb6d8ec5a71c8155 /cmake | |
| parent | 452e2b2c5c607ab5d63cd813793f1aa960f19d1c (diff) | |
| parent | 7630a83767dcee42d12bac68021f53aeb3d288f8 (diff) | |
| download | protobuf-aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5.tar.gz protobuf-aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5.tar.bz2 protobuf-aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5.zip | |
Merge pull request #1381 from pherl/internal-merge
Merge Google internal changes to an internal branch
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) |