diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-04-22 09:15:13 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2019-04-22 16:42:28 +0000 |
| commit | 44cc03e4fb588de7ff1ac75ebc9b8634d0092fdc (patch) | |
| tree | 34401679853aa3b97ea8f35201c43e03b770f2a5 /packaging | |
| parent | 5076e53ffb2b39d5d9ac2dcf6f2fd626bf2cafd7 (diff) | |
CMake+WiX: Add a note about merge module deprecation.
Change-Id: I2dd2b70e218b50cb43d47200de28b9d7d2e48abd
Reviewed-on: https://code.wireshark.org/review/32942
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index ad3c5ae54e..4a310a419b 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -83,6 +83,9 @@ elseif(MSVC_VERSION GREATER_EQUAL 1900) set (MSVC_CRT_VERSION "VC140") endif() +# Starting with Visual Studio 2019 merge modules are deprecated but +# are available as an individual component. +# https://docs.microsoft.com/en-us/visualstudio/releases/2019/release-notes#-deprecations set(MERGE_MODULE "Microsoft_${MSVC_CRT_VERSION}_CRT_${TARGET_MACHINE}.msm") set (PF86_ENV "ProgramFiles(x86)") |