summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2020-04-10 18:59:55 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2020-04-10 19:05:26 +0200
commit3ab21fd4e08228a930a4fa8a6e469a5c1def4d9f (patch)
treefe99ed28808e87aeda9398130858ae052bbd31a9 /win
parent93efbc390d13cb84fec4fad76a2c8b4d9e965fe8 (diff)
downloadmariadb-git-3ab21fd4e08228a930a4fa8a6e469a5c1def4d9f.tar.gz
Windows build - use InstallRequiredSystemLibraries for MSVC_CRT_TYPE=/MDbb-10.5-server-dll
CMake parameter This includes compiler-specific dependencies - tiny part of CRT, mostly memcpy/memset in msvcr140.dll - exception handling in msvc140_1.dll - C++ standard library in msvcp140 not much else CMake is smart enough to copy the dependencies into the bin directory itself.
Diffstat (limited to 'win')
-rw-r--r--win/packaging/CPackWixConfig.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/win/packaging/CPackWixConfig.cmake b/win/packaging/CPackWixConfig.cmake
index 74329e79247..4ac4d38471e 100644
--- a/win/packaging/CPackWixConfig.cmake
+++ b/win/packaging/CPackWixConfig.cmake
@@ -9,7 +9,7 @@ IF(ESSENTIALS)
ENDIF()
ELSE()
SET(CPACK_COMPONENTS_USED
- "Server;Client;Development;SharedLibraries;Documentation;Readme;Common;connect-engine;ClientPlugins;gssapi-server;gssapi-client;aws-key-management;rocksdb-engine;backup")
+ "Server;Client;Development;SharedLibraries;Documentation;Readme;Common;connect-engine;ClientPlugins;gssapi-server;gssapi-client;aws-key-management;rocksdb-engine;backup;VCCRT")
ENDIF()
SET( WIX_FEATURE_MySQLServer_EXTRA_FEATURES "DBInstance;SharedClientServerComponents")