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

Use protobuf 3.6.1 with MSVC Dynamic linkage on windows

Browse Source
This commit is contained in:
Corentin Le Molgat
2018-09-11 15:10:45 +02:00
parent f7fde3bd25
commit b11276d669
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
patches/protobuf-3.6.1.patch
View File

@@ -1,5 +1,5 @@
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 02174e96..ea5347cf 100644
index 02174e96..b82e50f0 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -7,7 +7,11 @@ endif()
@@ -15,6 +15,15 @@ index 02174e96..ea5347cf 100644
if(POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
endif()
@@ -35,7 +39,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})
diff --git a/cmake/install.cmake b/cmake/install.cmake
index 82036cb6..f13caa5d 100644
--- a/cmake/install.cmake