diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-21 00:31:04 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-21 00:34:19 -0800 |
| commit | d21780841734326d8a7653710f4f23b5366c4447 (patch) | |
| tree | 25df44708c81059a3e1c7025e12b734cc80ee3f4 /cmake | |
| parent | 1e2fece3e01b8e079b4f6930306377a9332a2ddb (diff) | |
| parent | b27f2893b2a118b4e3bfcd23d32114dbdd4e6d9b (diff) | |
| download | protobuf-d21780841734326d8a7653710f4f23b5366c4447.tar.gz protobuf-d21780841734326d8a7653710f4f23b5366c4447.tar.bz2 protobuf-d21780841734326d8a7653710f4f23b5366c4447.zip | |
Merge branch master into v3.0.0-beta-2
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 9de6341a..15ae457a 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -115,6 +115,8 @@ else (protobuf_BUILD_SHARED_LIBS) 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) string(REPLACE "/" "\\" PROTOBUF_SOURCE_WIN32_PATH ${protobuf_SOURCE_DIR}) string(REPLACE "/" "\\" PROTOBUF_BINARY_WIN32_PATH ${protobuf_BINARY_DIR}) |