forked from osmocom/wireshark
Fix detection of NSIS/WiX install path when running a win64 CMake
On x86 system: System32\cmd.exe ProgramFiles=C:\Program Files On x64 system: System32\cmd.exe ProgramFiles=C:\Program Files ProgramFiles(x86)=C:\Program Files (x86) ProgramW6432=C:\Program Files Syswow64\cmd.exe ProgramFiles=C:\Program Files (x86) ProgramFiles(x86)=C:\Program Files (x86) ProgramW6432=C:\Program Files Change-Id: I32d52219366b299f1e8099dc6d7737970dc398dd Reviewed-on: https://code.wireshark.org/review/16346 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
parent
01c6483b45
commit
8e1cc70fd5
|
@ -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."
|
||||
)
|
||||
|
|
|
@ -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."
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue