Wix: Look for merge modules in %VCToolsRedistDir%.
authorGerald Combs <gerald@wireshark.org>
Wed, 14 Feb 2018 00:15:22 +0000 (16:15 -0800)
committerAnders Broman <a.broman58@gmail.com>
Wed, 14 Feb 2018 05:31:16 +0000 (05:31 +0000)
Add "%VCToolsRedistDir%\MergeModules" to the merge module search path.
This is required for Visual Studio 2017 here.

Change-Id: I91cd1527ae80c85ed304c1233436cae52aa0a501
Reviewed-on: https://code.wireshark.org/review/25782
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
packaging/wix/CMakeLists.txt

index 386678bf6106156daf886da8c7fc352763a74ca3..0ecfdeefad40db92103b7916bc204a65994ce66a 100644 (file)
@@ -113,9 +113,15 @@ endif()
 set(MERGE_MODULE "Microsoft_${MSVC_CRT_VERSION}_CRT_${TARGET_MACHINE}.msm")
 set (PF86_ENV "ProgramFiles(x86)")
 
+set(VC_TOOLS_MERGE_MODULES_DIR)
+if (DEFINED ENV{VCToolsRedistDir})
+       set(VC_TOOLS_MERGE_MODULES_DIR "$ENV{VCToolsRedistDir}/MergeModules")
+endif()
+
 find_path(MERGE_MODULE_DIR ${MERGE_MODULE}
        PATHS
                #"$ENV{VCINSTALLDIR}/VC/Redist/MSVC/how-do-we-get-this-version/Merge Modules"
+               ${VC_TOOLS_MERGE_MODULES_DIR}
                "$ENV{${PF86_ENV}}/Common Files/Merge Modules"
                "$ENV{PROGRAMFILES}/Common Files/Merge Modules"
        NO_DEFAULT_PATH