diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2019-06-27 19:33:25 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2019-06-27 19:33:25 +0200 |
| commit | 74a744b51f3cf9b6426b02074f6587bb01909a45 (patch) | |
| tree | dc68fa6ecf40cafca86483643e2c32e65a288977 /cmake/os | |
| parent | b60aee58c7fda4c062f1c595ece7a076abd60e03 (diff) | |
| download | mariadb-git-74a744b51f3cf9b6426b02074f6587bb01909a45.tar.gz | |
Windows : Do not package redistributable C runtime , nor merge modules into Windows
installers
Rely on Universal CRT to be on every computer we install.
Diffstat (limited to 'cmake/os')
| -rw-r--r-- | cmake/os/Windows.cmake | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index 57594ddd1d2..6a2657d1a33 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -106,16 +106,6 @@ IF(MSVC) OPTION(DYNAMIC_UCRT_LINK "Link Universal CRT dynamically, if MSVC_CRT_TYPE=/MT" ON) SET(DYNAMIC_UCRT_LINKER_OPTION " /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") - IF((MSVC_CRT_TYPE MATCHES "/MD") OR DYNAMIC_UCRT_LINK) - # Dynamic runtime (DLLs), need to install CRT libraries. - SET(CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT VCCRT) - SET(CMAKE_INSTALL_UCRT_LIBRARIES TRUE) - IF(MSVC_CRT_TYPE STREQUAL "/MDd") - SET (CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY TRUE) - ENDIF() - INCLUDE(InstallRequiredSystemLibraries) - ENDIF() - IF(WITH_ASAN) ENABLE_ASAN() ENDIF() |