diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2013-07-24 11:09:11 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2013-07-24 11:09:11 +0200 |
commit | f9aef5290d8abd59bab1c8fc4e9ae680822be0eb (patch) | |
tree | 018240fca215e476eecfe00f1a450c6520c5556f /cmake | |
parent | 8aa85466dffce7d8e4febb5e1aa9aebe0bea5297 (diff) | |
download | cmocka-f9aef5290d8abd59bab1c8fc4e9ae680822be0eb.zip cmocka-f9aef5290d8abd59bab1c8fc4e9ae680822be0eb.tar.gz cmocka-f9aef5290d8abd59bab1c8fc4e9ae680822be0eb.tar.bz2 |
cmake: Update FindNSIS module.
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/Modules/FindNSIS.cmake | 54 |
1 files changed, 37 insertions, 17 deletions
diff --git a/cmake/Modules/FindNSIS.cmake b/cmake/Modules/FindNSIS.cmake index c391043..fcf0807 100644 --- a/cmake/Modules/FindNSIS.cmake +++ b/cmake/Modules/FindNSIS.cmake @@ -4,28 +4,48 @@ # NSIS_FOUND - system has NSIS # NSIS_MAKE - NSIS creator executable # -# Copyright (c) 2010 Andreas Schneider <mail@cynapses.org> +#============================================================================= +# Copyright (c) 2010-2013 Andreas Schneider <asn@cryptomilk.org> # -# Redistribution and use is allowed according to the terms of the New -# BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= # -if (NSIS_MAKE) - # in cache already - set(NSIS_FOUND TRUE) -elseif (NSIS_MAKE) - find_program(NSIS_MAKE +if (WIN32) + set(_NSIS_ROOT_HINTS + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\NSIS;Default]") + + set(_NSIS_ROOT_PATHS + $ENV{PROGRAMFILES}/NSIS) + + find_path(NSIS_ROOT_PATH NAMES - makensis + Include/Library.nsh + HINTS + ${_NSIS_ROOT_HINTS} PATHS - ${_NSIS_DIR} - ${_NSIS_DIR}/Bin - $ENV{PROGRAMFILES}/NSIS - ) + ${_NSIS_ROOT_PATHS} + ) + mark_as_advanced(NSIS_ROOT_PATH) +endif (WIN32) - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(NSIS DEFAULT_MSG NSIS_MAKE) +find_program(NSIS_MAKE + NAMES + makensis + PATH + ${NSIS_ROOT_PATH} +) - mark_as_advanced(NSIS_MAKE) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(NSIS DEFAULT_MSG NSIS_MAKE) + +if (NSIS_MAKE) + set(NSIS_FOUND TRUE) endif (NSIS_MAKE) + +mark_as_advanced(NSIS_MAKE) |