third_party/protobuf/cmake/CMakeLists.txt - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/cmake/CMakeLists.txt

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: owners Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: third_party/protobuf/cmake/CMakeLists.txt

diff --git a/third_party/protobuf/cmake/CMakeLists.txt b/third_party/protobuf/cmake/CMakeLists.txt

index 15ae457aa2b35640e785759a19e888ce7e15066e..f32a0e4e65e538a91e47cfa09900721e4f3954c4 100644

--- a/third_party/protobuf/cmake/CMakeLists.txt

+++ b/third_party/protobuf/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)

« no previous file with comments | « third_party/protobuf/benchmarks/google_speed.proto ('k') | third_party/protobuf/cmake/README.md » ('j') | no next file with comments »