diff options
Diffstat (limited to 'cmake/modules/FindWiX.cmake')
-rw-r--r-- | cmake/modules/FindWiX.cmake | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/cmake/modules/FindWiX.cmake b/cmake/modules/FindWiX.cmake index 1761bbb864..991e858464 100644 --- a/cmake/modules/FindWiX.cmake +++ b/cmake/modules/FindWiX.cmake @@ -9,18 +9,30 @@ set(_PF86 "PROGRAMFILES(x86)") # Find candle find_program(WIX_CANDLE_EXECUTABLE candle - PATH "$ENV{PROGRAMFILES}/WiX Toolset v3.10/bin" "$ENV{${_PF86}}/WiX Toolset v3.10/bin" "$ENV{PROGRAMW6432}/WiX Toolset v3.10/bin" + PATH + "$ENV{WIX}" + "$ENV{PROGRAMFILES}/WiX Toolset v3.10/bin" + "$ENV{${_PF86}}/WiX Toolset v3.10/bin" + "$ENV{PROGRAMW6432}/WiX Toolset v3.10/bin" DOC "Path to the WiX candle utility." ) # Find light find_program(WIX_LIGHT_EXECUTABLE light - PATH "$ENV{PROGRAMFILES}/WiX Toolset v3.10/bin" "$ENV{${_PF86}}/WiX Toolset v3.10/bin" "$ENV{PROGRAMW6432}/WiX Toolset v3.10/bin" + PATH + "$ENV{WIX}" + "$ENV{PROGRAMFILES}/WiX Toolset v3.10/bin" + "$ENV{${_PF86}}/WiX Toolset v3.10/bin" + "$ENV{PROGRAMW6432}/WiX Toolset v3.10/bin" DOC "Path to the WiX light utility." ) -# Find light +# Find heat find_program(WIX_HEAT_EXECUTABLE heat - PATH "$ENV{PROGRAMFILES}/WiX Toolset v3.10/bin" "$ENV{${_PF86}}/WiX Toolset v3.10/bin" "$ENV{PROGRAMW6432}/WiX Toolset v3.10/bin" + PATH + "$ENV{WIX}" + "$ENV{PROGRAMFILES}/WiX Toolset v3.10/bin" + "$ENV{${_PF86}}/WiX Toolset v3.10/bin" + "$ENV{PROGRAMW6432}/WiX Toolset v3.10/bin" DOC "Path to the WiX heat utility." ) |