diff options
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/FindNSIS.cmake | 3 | ||||
| -rw-r--r-- | cmake/modules/FindWiX.cmake | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/cmake/modules/FindNSIS.cmake b/cmake/modules/FindNSIS.cmake index 5429ac681b..1b68cd31cd 100644 --- a/cmake/modules/FindNSIS.cmake +++ b/cmake/modules/FindNSIS.cmake @@ -6,7 +6,8 @@ # CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS - System runtime DLLs # Find makensis +set(_PF86 "PROGRAMFILES(x86)") find_program(MAKENSIS_EXECUTABLE makensis - PATH "$ENV{PROGRAMFILES}/NSIS" "$ENV{PROGRAMW6432}/NSIS" + PATH "$ENV{PROGRAMFILES}/NSIS" "$ENV{${_PF86}}/NSIS" "$ENV{PROGRAMW6432}/NSIS" DOC "Path to the makensis utility." ) diff --git a/cmake/modules/FindWiX.cmake b/cmake/modules/FindWiX.cmake index f10f225d84..1761bbb864 100644 --- a/cmake/modules/FindWiX.cmake +++ b/cmake/modules/FindWiX.cmake @@ -5,20 +5,22 @@ # MAKEWIX_EXECUTABLE - path to the candle utility. # CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS - System runtime DLLs +set(_PF86 "PROGRAMFILES(x86)") + # Find candle find_program(WIX_CANDLE_EXECUTABLE candle - PATH "$ENV{PROGRAMFILES}/WiX Toolset v3.10/bin" "$ENV{PROGRAMW6432}/WiX Toolset v3.10/bin" + PATH "$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{PROGRAMW6432}/WiX Toolset v3.10/bin" + PATH "$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_program(WIX_HEAT_EXECUTABLE heat - PATH "$ENV{PROGRAMFILES}/WiX Toolset v3.10/bin" "$ENV{PROGRAMW6432}/WiX Toolset v3.10/bin" + PATH "$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." ) |