1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#25611609 LINK WITH DYNAMIC RUNTIME LIBRARIES ON WINDOWS

Browse Source 
Patch for 5.5 and 5.6
Use default runtime libraries on windows, i.e. build with /MD
This commit is contained in:
Tor Didriksen 2017-02-24 16:20:14 +01:00
parent 18b3aa1123
commit 19150f7e7a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/os/Windows.cmake
View File

@ -1,4 +1,4 @@
# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -64,6 +64,7 @@ IF(MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 4)
ENDIF()
IF(MSVC)
OPTION(LINK_STATIC_RUNTIME_LIBRARIES "Link with /MT" OFF)
# Enable debug info also in Release build,
# and create PDB to be able to analyze crashes.
FOREACH(type EXE SHARED MODULE)
@ -86,7 +87,9 @@ IF(MSVC)
CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG_INIT
CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO
CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG_INIT)
STRING(REPLACE "/MD" "/MT" "${flag}" "${${flag}}")
IF(LINK_STATIC_RUNTIME_LIBRARIES)
STRING(REPLACE "/MD" "/MT" "${flag}" "${${flag}}")
ENDIF()
STRING(REPLACE "/Zi" "/Z7" "${flag}" "${${flag}}")
ENDFOREACH()