2021-11-17 08:44:24 +08:00
|
|
|
diff --git a/build-cmake/CMakeLists.txt b/build-cmake/CMakeLists.txt
|
2024-08-02 00:57:53 +08:00
|
|
|
index 98b51eb..0243b80 100644
|
2021-11-17 08:44:24 +08:00
|
|
|
--- a/build-cmake/CMakeLists.txt
|
|
|
|
|
+++ b/build-cmake/CMakeLists.txt
|
2024-08-02 00:57:53 +08:00
|
|
|
@@ -66,11 +66,6 @@ if(MSVC)
|
|
|
|
|
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4267 /wd4244")
|
|
|
|
|
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4244")
|
|
|
|
|
|
|
|
|
|
- # Allow matching protobuf runtime dependency
|
|
|
|
|
- if(NOT BUILD_SHARED_LIBS)
|
|
|
|
|
- set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
|
|
|
|
|
- endif(NOT BUILD_SHARED_LIBS)
|
|
|
|
|
-
|
|
|
|
|
ENDIF()
|
|
|
|
|
|
|
|
|
|
get_filename_component(MAIN_DIR ${CMAKE_CURRENT_SOURCE_DIR} PATH)
|
|
|
|
|
@@ -103,7 +98,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # for generated files
|
|
|
|
|
|
2021-11-17 08:44:24 +08:00
|
|
|
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
|
2024-08-02 00:57:53 +08:00
|
|
|
@@ -118,7 +113,7 @@ if (MSVC AND NOT BUILD_SHARED_LIBS)
|
|
|
|
|
string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
|
|
|
|
|
endif(${flag_var} MATCHES "/MD")
|
|
|
|
|
endforeach(flag_var)
|
|
|
|
|
-endif (MSVC AND NOT BUILD_SHARED_LIBS)
|
|
|
|
|
+endif ()
|
|
|
|
|
|
|
|
|
|
if(WIN32)
|
|
|
|
|
# Modify the environment to hint protoc where the plugin is
|
