osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

CMake: Update our WiX search paths.

This commit is contained in:
Gerald Combs 2021-12-22 13:07:18 -08:00
parent a11f105e44
commit dea3d5e5fc
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmake/modules/FindWiX.cmake
View File

@ -17,9 +17,9 @@ set(_PF86 "PROGRAMFILES(x86)")
find_program(WIX_CANDLE_EXECUTABLE candle
PATH
"$ENV{WIX}/bin"
"$ENV{PROGRAMFILES}/WiX Toolset v3.10/bin"
"$ENV{${_PF86}}/WiX Toolset v3.10/bin"
"$ENV{PROGRAMW6432}/WiX Toolset v3.10/bin"
"$ENV{PROGRAMFILES}/WiX Toolset v3.11/bin"
"$ENV{${_PF86}}/WiX Toolset v3.11/bin"
"$ENV{PROGRAMW6432}/WiX Toolset v3.11/bin"
DOC "Path to the WiX candle utility."
)
@ -27,9 +27,9 @@ find_program(WIX_CANDLE_EXECUTABLE candle
find_program(WIX_LIGHT_EXECUTABLE light
PATH
"$ENV{WIX}/bin"
"$ENV{PROGRAMFILES}/WiX Toolset v3.10/bin"
"$ENV{${_PF86}}/WiX Toolset v3.10/bin"
"$ENV{PROGRAMW6432}/WiX Toolset v3.10/bin"
"$ENV{PROGRAMFILES}/WiX Toolset v3.11/bin"
"$ENV{${_PF86}}/WiX Toolset v3.11/bin"
"$ENV{PROGRAMW6432}/WiX Toolset v3.11/bin"
DOC "Path to the WiX light utility."
)
@ -37,8 +37,8 @@ find_program(WIX_LIGHT_EXECUTABLE light
find_program(WIX_HEAT_EXECUTABLE heat
PATH
"$ENV{WIX}/bin"
"$ENV{PROGRAMFILES}/WiX Toolset v3.10/bin"
"$ENV{${_PF86}}/WiX Toolset v3.10/bin"
"$ENV{PROGRAMW6432}/WiX Toolset v3.10/bin"
"$ENV{PROGRAMFILES}/WiX Toolset v3.11/bin"
"$ENV{${_PF86}}/WiX Toolset v3.11/bin"
"$ENV{PROGRAMW6432}/WiX Toolset v3.11/bin"
DOC "Path to the WiX heat utility."
)