diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2018-08-21 12:06:14 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2018-08-21 12:06:14 +0200 |
| commit | 1293eaf853a573c27fe1a9b6355d0ff3d1050361 (patch) | |
| tree | 09d73d4e2f7126963dff1363ec7b425db4558310 /cmake | |
| parent | ca4ff8c174c749fdcfb2867e8fff06c2060d1c30 (diff) | |
| download | cmocka-1293eaf853a573c27fe1a9b6355d0ff3d1050361.tar.gz cmocka-1293eaf853a573c27fe1a9b6355d0ff3d1050361.tar.xz cmocka-1293eaf853a573c27fe1a9b6355d0ff3d1050361.zip | |
cmake: Update NSIS find module for Windows
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindNSIS.cmake | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cmake/Modules/FindNSIS.cmake b/cmake/Modules/FindNSIS.cmake index 08d839b..9f1ab17 100644 --- a/cmake/Modules/FindNSIS.cmake +++ b/cmake/Modules/FindNSIS.cmake @@ -1,6 +1,10 @@ # - Try to find NSIS # Once done this will define # +# NSIS_ROOT_PATH - Set this variable to the root installation of NSIS +# +# Read-Only variables: +# # NSIS_FOUND - system has NSIS # NSIS_MAKE - NSIS creator executable # @@ -17,17 +21,16 @@ # if (WIN32) - set(_NSIS_ROOT_HINTS - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\NSIS;Default]") + set(_x86 "(x86)") set(_NSIS_ROOT_PATHS - $ENV{PROGRAMFILES}/NSIS) + "$ENV{ProgramFiles}/NSIS" + "$ENV{ProgramFiles${_x86}}/NSIS" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\NSIS;Default]") find_path(NSIS_ROOT_PATH NAMES Include/Library.nsh - HINTS - ${_NSIS_ROOT_HINTS} PATHS ${_NSIS_ROOT_PATHS} ) |