always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bump protobuf to 3.10.0

Browse Source
This commit is contained in:
Laurent Perron
2019-10-10 13:56:32 +02:00
parent bab6532297
commit ea614006cc
8 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dependencies.txt
View File

@@ -1,4 +1,4 @@
Protobuf=3.8.0
Protobuf=3.10.0
gflags=2.2.2
glog=0.4.0
Cbc=2.10.3

2
cmake/dependencies/CMakeLists.txt
View File

@@ -102,7 +102,7 @@ if(BUILD_Protobuf)
REPOSITORY
"https://github.com/protocolbuffers/protobuf.git"
TAG
"v3.8.0"
"v3.10.0"
CMAKE_ARGS
"SOURCE_SUBDIR cmake"
)

2
makefiles/Makefile.third_party.unix.mk
View File

@@ -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.9.0
PROTOBUF_TAG = 3.10.0
ABSL_TAG = bf29470
CBC_TAG = 2.10.3
CGL_TAG = 0.60.2

2
makefiles/Makefile.third_party.win.mk
View File

@@ -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.9.0
PROTOBUF_TAG = 3.10.0
ABSL_TAG = bf29470
CBC_TAG = 2.10.3
CGL_TAG = 0.60.2

2
ortools/dotnet/Google.OrTools.runtime.linux-x64/Google.OrTools.runtime.linux-x64.csproj.in
View File

@@ -91,6 +91,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.9.0" />
<PackageReference Include="Google.Protobuf" Version="3.10.0" />
</ItemGroup>
</Project>

2
ortools/dotnet/Google.OrTools.runtime.osx-x64/Google.OrTools.runtime.osx-x64.csproj.in
View File

@@ -91,6 +91,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.9.0" />
<PackageReference Include="Google.Protobuf" Version="3.10.0" />
</ItemGroup>
</Project>

2
ortools/dotnet/Google.OrTools.runtime.win-x64/Google.OrTools.runtime.win-x64.csproj.in
View File

@@ -87,6 +87,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.9.0" />
<PackageReference Include="Google.Protobuf" Version="3.10.0" />
</ItemGroup>
</Project>

13
patches/protobuf-3.10.0.patch Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 71a0f37a..bbb749d3 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})