Skip to content

Commit ab406f9

Browse files
author
Tor Didriksen
committed
Bug#25611609 LINK WITH DYNAMIC RUNTIME LIBRARIES ON WINDOWS
Patch for 5.7 and up. Add option LINK_STATIC_RUNTIME_LIBRARIES, defalt OFF.
1 parent c6d2005 commit ab406f9

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

cmake/os/Windows.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ ENDIF()
6767
OPTION(WIN_DEBUG_NO_INLINE "Disable inlining for debug builds on Windows" OFF)
6868

6969
IF(MSVC)
70+
OPTION(LINK_STATIC_RUNTIME_LIBRARIES "Link with /MT" OFF)
7071
# Enable debug info also in Release build,
7172
# and create PDB to be able to analyze crashes.
7273
FOREACH(type EXE SHARED MODULE)
@@ -103,8 +104,9 @@ IF(MSVC)
103104
CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG_INIT
104105
CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO
105106
CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG_INIT)
106-
# Disable this substitution, use default, which is /MD
107-
# STRING(REPLACE "/MD" "/MT" "${flag}" "${${flag}}")
107+
IF(LINK_STATIC_RUNTIME_LIBRARIES)
108+
STRING(REPLACE "/MD" "/MT" "${flag}" "${${flag}}")
109+
ENDIF()
108110
STRING(REPLACE "/Zi" "/Z7" "${flag}" "${${flag}}")
109111
IF (NOT WIN_DEBUG_NO_INLINE)
110112
STRING(REPLACE "/Ob0" "/Ob1" "${flag}" "${${flag}}")

0 commit comments

Comments
 (0)