From c6e1792696829788572c82db5533f00a8ef42d2d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sun, 16 Jan 2011 12:12:35 +0100 Subject: cmake: Improved the NSIS module. --- cmake/Modules/FindNSIS.cmake | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'cmake') diff --git a/cmake/Modules/FindNSIS.cmake b/cmake/Modules/FindNSIS.cmake index c92c2401..9bc6d395 100644 --- a/cmake/Modules/FindNSIS.cmake +++ b/cmake/Modules/FindNSIS.cmake @@ -1,23 +1,42 @@ # - Try to find NSIS # Once done this will define # +# NSIS_ROOT_DIR - Set this variable to the root installation of ZLIB +# +# Read-Only variables: # NSIS_FOUND - system has NSIS # NSIS_MAKE - NSIS creator executable # -# Copyright (c) 2010 Andreas Schneider +#============================================================================= +# Copyright (c) 2010-2011 Andreas Schneider +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. # -# Redistribution and use is allowed according to the terms of the New -# BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# 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. +#============================================================================= # +set(_NSIS_ROOT_PATHS + C:/NSIS/Bin + "$ENV{PROGRAMFILES}/NSIS" +) + +find_path(NSIS_ROOT_PATHS + NAMES + NSIS.exe + PATHS + ${_NSIS_ROOT_PATHS} +) + find_program(NSIS_MAKE NAMES makensis PATHS - ${_NSIS_DIR} - ${_NSIS_DIR}/Bin - $ENV{PROGRAMFILES}/NSIS + ${NSIS_ROOT_PATH} + ${NSIS_ROOT_PATH}/Bin ) include(FindPackageHandleStandardArgs) -- cgit v1.2.3