aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Xiao <xiaofeng@google.com>2015-12-12 12:12:47 -0800
committerFeng Xiao <xiaofeng@google.com>2015-12-12 12:12:47 -0800
commitdc633398af5c87e1fe1ffcedaebd697c4775c918 (patch)
tree1eb46a2ce3e6c2efff918af61ceb6ea31dbd047c
parent99a6a95c751a28a3cc33dd2384959179f83f682c (diff)
parent9fc4d90cab7919d5a76f612bd98a65faee02df75 (diff)
downloadprotobuf-dc633398af5c87e1fe1ffcedaebd697c4775c918.tar.gz
protobuf-dc633398af5c87e1fe1ffcedaebd697c4775c918.tar.bz2
protobuf-dc633398af5c87e1fe1ffcedaebd697c4775c918.zip
Merge pull request #1028 from benbennett/cmake_vs_parallel_build_flag
MSVC MP flag to build with multiple processes in visual studio.
-rw-r--r--cmake/CMakeLists.txt2
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})