CMake+WiX: Add a note about merge module deprecation.
authorGerald Combs <gerald@wireshark.org>
Mon, 22 Apr 2019 16:15:13 +0000 (09:15 -0700)
committerGerald Combs <gerald@wireshark.org>
Mon, 22 Apr 2019 16:42:28 +0000 (16:42 +0000)
Change-Id: I2dd2b70e218b50cb43d47200de28b9d7d2e48abd
Reviewed-on: https://code.wireshark.org/review/32942
Reviewed-by: Gerald Combs <gerald@wireshark.org>
packaging/wix/CMakeLists.txt

index ad3c5ae54ec3ffe4e7d28bb50ebce58174b40b75..4a310a419b570c34002e26a619f3ba6263cdc386 100644 (file)
@@ -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)")