aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-02-13 16:15:22 -0800
committerAnders Broman <a.broman58@gmail.com>2018-02-14 05:31:16 +0000
commit6f2d4c27126f3d1a73494ceafc464df99e081494 (patch)
tree80d59359b57ef1b1b11ab7f1ba6de6813736b944 /packaging
parent944e661514feca102e49e2d776f0a484e24fc597 (diff)
Wix: Look for merge modules in %VCToolsRedistDir%.
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>
Diffstat (limited to 'packaging')
-rw-r--r--packaging/wix/CMakeLists.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt
index 386678bf61..0ecfdeefad 100644
--- a/packaging/wix/CMakeLists.txt
+++ b/packaging/wix/CMakeLists.txt
@@ -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