diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-06-27 10:26:39 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2017-06-27 17:34:22 +0000 |
| commit | a6652a27783b59d23dca3405b0399690f38f3402 (patch) | |
| tree | 5d2d8473731048d01d3f348f548e24e4990ae593 | |
| parent | 1426c44281c2b266d7159340f7e75afc56141b18 (diff) | |
| download | wireshark-a6652a27783b59d23dca3405b0399690f38f3402.tar.gz | |
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>
| -rw-r--r-- | cmake/modules/FindWiX.cmake | 12 |
1 files 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" |