Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Make shared libraries be able to link to MSVC static runtime libraries, so that VC runtime is not required." #6914

Merged
merged 9 commits into from Nov 20, 2019
Merged

Revert "Make shared libraries be able to link to MSVC static runtime libraries, so that VC runtime is not required." #6914

Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7471a0a
Update CHANGES.txt with 3.11.0-RC1 release notes
rafi-kamal Nov 19, 2019
bc0e3c9
Update the description of Python changes
rafi-kamal Nov 20, 2019
7ab5173
Expand the section on C# Proto2 support
rafi-kamal Nov 20, 2019
2ac5df2
Removed the C# Proto2 feature implementation PR in favour of the gett…
rafi-kamal Nov 20, 2019
d0dbd19
Updated release notes for Obj-C
rafi-kamal Nov 20, 2019
2b6acbd
Removed unnecessary/internal changes from Java and Javascript
rafi-kamal Nov 20, 2019
677b77f
Revert "Make shared libraries be able to link to MSVC static runtime …
rafi-kamal Nov 20, 2019
ad72345
Merge branch '3.11.x' of https://github.com/rafi-kamal/protobuf into …
rafi-kamal Nov 20, 2019
481f676
Remove the line from CHANGES.txt that mentions #6780
rafi-kamal Nov 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 16 additions & 14 deletions cmake/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -40,6 +40,8 @@ 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
"NOT protobuf_BUILD_SHARED_LIBS" OFF)
set(protobuf_WITH_ZLIB_DEFAULT ON)
option(protobuf_WITH_ZLIB "Build with zlib support" ${protobuf_WITH_ZLIB_DEFAULT})
set(protobuf_DEBUG_POSTFIX "d"
Expand Down Expand Up @@ -153,22 +155,22 @@ if (protobuf_BUILD_SHARED_LIBS)
set(protobuf_SHARED_OR_STATIC "SHARED")
else (protobuf_BUILD_SHARED_LIBS)
set(protobuf_SHARED_OR_STATIC "STATIC")
# In case we are building static libraries, link also the runtime library statically
# so that MSVCR*.DLL is not required at runtime.
# https://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx
# This is achieved by replacing msvc option /MD with /MT and /MDd with /MTd
# http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F
if (MSVC AND protobuf_MSVC_STATIC_RUNTIME)
foreach(flag_var
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
if(${flag_var} MATCHES "/MD")
string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
endif(${flag_var} MATCHES "/MD")
endforeach(flag_var)
endif (MSVC AND protobuf_MSVC_STATIC_RUNTIME)
endif (protobuf_BUILD_SHARED_LIBS)

# In case we are linking the runtime library statically so that MSVCR*.DLL is not required at runtime.
# https://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx
# This is achieved by replacing msvc option /MD with /MT and /MDd with /MTd
# http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F
if (MSVC AND protobuf_MSVC_STATIC_RUNTIME)
foreach(flag_var
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
if(${flag_var} MATCHES "/MD")
string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
endif(${flag_var} MATCHES "/MD")
endforeach(flag_var)
endif (MSVC AND protobuf_MSVC_STATIC_RUNTIME)

if (MSVC)
# Build with multiple processes
add_definitions(/MP)
Expand Down