From a6652a27783b59d23dca3405b0399690f38f3402 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Tue, 27 Jun 2017 10:26:39 -0700
Subject: CMake: Fix the WiX search path.

Look for WiX executables in $WIX/bin instead of $WIX.

Change-Id: Id55eb8e73403d2beed55d64e9bdc6812308c359f
Reviewed-on: https://code.wireshark.org/review/22423
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 cmake/modules/FindWiX.cmake | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/cmake/modules/FindWiX.cmake b/cmake/modules/FindWiX.cmake
index 991e858464..ddfa721d06 100644
--- a/cmake/modules/FindWiX.cmake
+++ b/cmake/modules/FindWiX.cmake
@@ -7,10 +7,16 @@
 
 set(_PF86 "PROGRAMFILES(x86)")
 
+# According to
+# https://stackoverflow.com/questions/2375322/variable-for-wix-bin-directory-path
+# and
+# http://weblogs.sqlteam.com/mladenp/archive/2010/02/23/WiX-3-Tutorial-Generating-filedirectory-fragments-with-Heat.exe.aspx
+# WiX binaries are in $ENV{WIX}/bin.
+
 # Find candle
 find_program(WIX_CANDLE_EXECUTABLE candle
 	PATH
-		"$ENV{WIX}"
+		"$ENV{WIX}/bin"
 		"$ENV{PROGRAMFILES}/WiX Toolset v3.10/bin"
 		"$ENV{${_PF86}}/WiX Toolset v3.10/bin"
 		"$ENV{PROGRAMW6432}/WiX Toolset v3.10/bin"
@@ -20,7 +26,7 @@ find_program(WIX_CANDLE_EXECUTABLE candle
 # Find light
 find_program(WIX_LIGHT_EXECUTABLE light
 	PATH
-		"$ENV{WIX}"
+		"$ENV{WIX}/bin"
 		"$ENV{PROGRAMFILES}/WiX Toolset v3.10/bin"
 		"$ENV{${_PF86}}/WiX Toolset v3.10/bin"
 		"$ENV{PROGRAMW6432}/WiX Toolset v3.10/bin"
@@ -30,7 +36,7 @@ find_program(WIX_LIGHT_EXECUTABLE light
 # Find heat
 find_program(WIX_HEAT_EXECUTABLE heat
 	PATH
-		"$ENV{WIX}"
+		"$ENV{WIX}/bin"
 		"$ENV{PROGRAMFILES}/WiX Toolset v3.10/bin"
 		"$ENV{${_PF86}}/WiX Toolset v3.10/bin"
 		"$ENV{PROGRAMW6432}/WiX Toolset v3.10/bin"
-- 
cgit v1.2.1