mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-13 05:49:02 +08:00
c3bab00ceb
* Update protobuf-c to 1.4.0 * Update CI baseline * Remove entries from CI baseline * Fix CRT linkage * Update CI baseline * Minimize patch * Update CI baseline Co-authored-by: chausner <chausner@users.noreply.github.com>
13 lines
433 B
Diff
13 lines
433 B
Diff
diff --git a/build-cmake/CMakeLists.txt b/build-cmake/CMakeLists.txt
|
|
--- a/build-cmake/CMakeLists.txt
|
|
+++ b/build-cmake/CMakeLists.txt
|
|
@@ -70,7 +70,7 @@ if (BUILD_PROTO3)
|
|
endif()
|
|
ENDIF()
|
|
|
|
-if (MSVC AND NOT BUILD_SHARED_LIBS)
|
|
+if (0)
|
|
# 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
|