? NSISNoLicenseFile.patch Index: Modules/CPack.cmake =================================================================== RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v retrieving revision 1.43 diff -u -r1.43 CPack.cmake --- Modules/CPack.cmake 5 Mar 2009 15:08:03 -0000 1.43 +++ Modules/CPack.cmake 24 Apr 2009 20:21:50 -0000 @@ -641,8 +641,15 @@ cpack_set_if_not_set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_ROOT}/Templates/CPack.GenericDescription.txt") -cpack_set_if_not_set(CPACK_RESOURCE_FILE_LICENSE - "${CMAKE_ROOT}/Templates/CPack.GenericLicense.txt") + +if ( NOT DEFINED CPACK_RESOURCE_FILE_LICENSE ) + set(CPACK_RESOURCE_FILE_LICENSE + "${CMAKE_ROOT}/Templates/CPack.GenericLicense.txt") + set(CPACK_RESOURCE_FILE_LICENSE_PROVIDED "0") +else ( NOT DEFINED CPACK_RESOURCE_FILE_LICENSE ) + set(CPACK_RESOURCE_FILE_LICENSE_PROVIDED "1") +endif ( NOT DEFINED CPACK_RESOURCE_FILE_LICENSE ) + cpack_set_if_not_set(CPACK_RESOURCE_FILE_README "${CMAKE_ROOT}/Templates/CPack.GenericDescription.txt") cpack_set_if_not_set(CPACK_RESOURCE_FILE_WELCOME Index: Modules/NSIS.template.in =================================================================== RCS file: /cvsroot/CMake/CMake/Modules/NSIS.template.in,v retrieving revision 1.36 diff -u -r1.36 NSIS.template.in --- Modules/NSIS.template.in 7 Apr 2009 19:31:51 -0000 1.36 +++ Modules/NSIS.template.in 24 Apr 2009 20:21:50 -0000 @@ -516,7 +516,9 @@ ;Pages !insertmacro MUI_PAGE_WELCOME - !insertmacro MUI_PAGE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@" + !if @CPACK_RESOURCE_FILE_LICENSE_PROVIDED@ + !insertmacro MUI_PAGE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@" + !endif Page custom InstallOptionsPage !insertmacro MUI_PAGE_DIRECTORY