Skip to content

Commit

Permalink
Make protobuf.gyp compatible with Probobuf v25.0
Browse files Browse the repository at this point in the history
This is a preparation to update Protobuf to v25.0 (#841).

With this commit, protobuf.gyp becomes compatible with both v24.2 and
v25.0.

Note that Protobuf version is not yet updated in this commit.
Thus there must be no observable behavior change.

PiperOrigin-RevId: 579739765
  • Loading branch information
yukawa authored and hiroyuki-komatsu committed Nov 6, 2023
1 parent c920e68 commit 013e8aa
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions src/protobuf/protobuf.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@
],
# Sources for protoc (common part and C++ generator only).
'protoc_sources': [
'<!@(<(glob_protobuf) compiler "*.cc" --exclude "*_tester.cc" fake_plugin.cc main.cc)',
'<!@(<(glob_protobuf) compiler "*.cc" --exclude "*_tester.cc" fake_plugin.cc test_plugin.cc main.cc)',
'<!@(<(glob_protobuf) compiler/allowlists "*.cc")',
'<!@(<(glob_protobuf) compiler/cpp "**/*.cc")',
'<!@(<(glob_protobuf) compiler/cpp "**/*.cc" --exclude main.cc)',
'custom_protoc_main.cc',
],
},
Expand Down Expand Up @@ -122,6 +122,13 @@
'msvs_disabled_warnings': [
'<@(msvc_disabled_warnings_for_protoc)',
],
'msvs_settings': {
'VCCLCompilerTool': {
'AdditionalOptions': [
'/permissive', # https://github.com/protocolbuffers/protobuf/issues/14602
],
},
},
'xcode_settings': {
'USE_HEADERMAP': 'NO',
},
Expand Down

0 comments on commit 013e8aa

Please sign in to comment.