Bump Protobuf 3.10.0 -> 3.11.2

IspML · Jan 9, 2020 · d69c8cf · d69c8cf
1 parent 152838b
commit d69c8cf
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 6 deletions.
diff --git a/Dependencies.txt b/Dependencies.txt
@@ -1,4 +1,4 @@
-Protobuf=3.10.0
+Protobuf=3.11.2
 gflags=2.2.2
 glog=0.4.0
 Cbc=2.10.3

diff --git a/WORKSPACE b/WORKSPACE
@@ -27,7 +27,7 @@ git_repository(
 
 git_repository(
     name = "com_google_protobuf_cc",
-    commit = "6d4e7fd",  # release v3.10.0
+    commit = "fe1790c",  # release v3.11.2
     remote = "https://github.com/protocolbuffers/protobuf.git",
 )
 

diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt
@@ -102,7 +102,7 @@ if(BUILD_Protobuf)
     REPOSITORY
       "https://github.com/protocolbuffers/protobuf.git"
     TAG
-      "v3.10.0"
+      "v3.11.2"
     CMAKE_ARGS
 	  -Dprotobuf_MSVC_STATIC_RUNTIME:BOOL=OFF
       "SOURCE_SUBDIR cmake"

diff --git a/makefiles/Makefile.third_party.unix.mk b/makefiles/Makefile.third_party.unix.mk
@@ -21,7 +21,7 @@ PROTOC_BINARY := $(shell $(WHICH) ${UNIX_PROTOC_BINARY})
 # Tags of dependencies to checkout.
 GFLAGS_TAG = 2.2.2
 GLOG_TAG = 0.4.0
-PROTOBUF_TAG = 3.10.0
+PROTOBUF_TAG = 3.11.2
 ABSL_TAG = 8ba96a8
 CBC_TAG = 2.10.3
 CGL_TAG = 0.60.2

diff --git a/makefiles/Makefile.third_party.win.mk b/makefiles/Makefile.third_party.win.mk
@@ -37,7 +37,7 @@ ZLIB_TAG = 1.2.11
 ZLIB_ARCHIVE_TAG = 1211
 GFLAGS_TAG = 2.2.2
 GLOG_TAG = 0.4.0
-PROTOBUF_TAG = 3.10.0
+PROTOBUF_TAG = 3.11.2
 ABSL_TAG = 8ba96a8
 CBC_TAG = 2.10.3
 CGL_TAG = 0.60.2

diff --git a/ortools/dotnet/Google.OrTools/Google.OrTools.csproj.in b/ortools/dotnet/Google.OrTools/Google.OrTools.csproj.in
@@ -135,7 +135,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.10.0"/>
+    <PackageReference Include="Google.Protobuf" Version="3.11.2"/>
   </ItemGroup>
 
   <!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->

diff --git a/patches/protobuf-3.11.2.patch b/patches/protobuf-3.11.2.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
+index 8e5e68073..9f954e1a2 100644
+--- a/cmake/CMakeLists.txt
++++ b/cmake/CMakeLists.txt
+@@ -40,7 +40,7 @@ else (BUILD_SHARED_LIBS)
+ endif (BUILD_SHARED_LIBS)
+ option(protobuf_BUILD_SHARED_LIBS "Build Shared Libraries" ${protobuf_BUILD_SHARED_LIBS_DEFAULT})
+ include(CMakeDependentOption)
+-cmake_dependent_option(protobuf_MSVC_STATIC_RUNTIME "Link static runtime libraries" ON
++cmake_dependent_option(protobuf_MSVC_STATIC_RUNTIME "Link static runtime libraries" OFF
+   "NOT protobuf_BUILD_SHARED_LIBS" OFF)
+ set(protobuf_WITH_ZLIB_DEFAULT ON)
+ option(protobuf_WITH_ZLIB "Build with zlib support" ${protobuf_WITH_ZLIB_DEFAULT})