aboutsummaryrefslogtreecommitdiff
path: root/cmake/Modules/FindNSIS.cmake
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2018-08-13 21:38:10 +0200
committerAndreas Schneider <asn@cryptomilk.org>2018-08-13 21:48:48 +0200
commit0656f8a43d2ecc0374fdc1627ec49dd258ca7b88 (patch)
treec592d765395b48f827684f9a47768d1c8a897598 /cmake/Modules/FindNSIS.cmake
parent66a3bc0332cda91484dc02a393b7e6701df218b8 (diff)
downloadlibssh-0656f8a43d2ecc0374fdc1627ec49dd258ca7b88.tar.gz
libssh-0656f8a43d2ecc0374fdc1627ec49dd258ca7b88.tar.xz
libssh-0656f8a43d2ecc0374fdc1627ec49dd258ca7b88.zip
cmake: Improve NSIS detection on Windows
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'cmake/Modules/FindNSIS.cmake')
-rw-r--r--cmake/Modules/FindNSIS.cmake9
1 files changed, 4 insertions, 5 deletions
diff --git a/cmake/Modules/FindNSIS.cmake b/cmake/Modules/FindNSIS.cmake
index 21f80d86..9f1ab176 100644
--- a/cmake/Modules/FindNSIS.cmake
+++ b/cmake/Modules/FindNSIS.cmake
@@ -21,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}
)