[Cmake-commits] [cmake-commits] david.cole committed NSIS.template.in 1.35 1.36

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Apr 7 15:31:54 EDT 2009


Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv29603

Modified Files:
	NSIS.template.in 
Log Message:
BUG: Fix issue #8682. Use CPACK_NSIS_DISPLAY_NAME in appropriate places rather than CPACK_PACKAGE_INSTALL_DIRECTORY. Clean separation of these two variables (which have the same value by default) allows an easy workaround for issue #7881, too.


Index: NSIS.template.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/NSIS.template.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -C 2 -d -r1.35 -r1.36
*** NSIS.template.in	2 Sep 2008 18:46:45 -0000	1.35
--- NSIS.template.in	7 Apr 2009 19:31:51 -0000	1.36
***************
*** 26,30 ****
  
    ;Default installation folder
!   InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"  
  
  ;--------------------------------
--- 26,30 ----
  
    ;Default installation folder
!   InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
  
  ;--------------------------------
***************
*** 32,45 ****
  
    ;Name and file
!   Name "@CPACK_PACKAGE_INSTALL_DIRECTORY@"
    OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
  
    ;Set compression
    SetCompressor @CPACK_NSIS_COMPRESSOR@
!    
  @CPACK_NSIS_DEFINES@   
!    
    !include Sections.nsh
!   
  ;--- Component support macros: ---
  ; The code for the add/remove functionality is from:
--- 32,45 ----
  
    ;Name and file
!   Name "@CPACK_NSIS_DISPLAY_NAME@"
    OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
  
    ;Set compression
    SetCompressor @CPACK_NSIS_COMPRESSOR@
! 
  @CPACK_NSIS_DEFINES@   
! 
    !include Sections.nsh
! 
  ;--- Component support macros: ---
  ; The code for the add/remove functionality is from:
***************
*** 702,706 ****
  ; Create custom pages
  Function InstallOptionsPage
!   !insertmacro MUI_HEADER_TEXT "Install Options" "Chose options for installing @CPACK_PACKAGE_INSTALL_DIRECTORY@"
    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "NSIS.InstallOptions.ini"
  
--- 702,706 ----
  ; Create custom pages
  Function InstallOptionsPage
!   !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing @CPACK_NSIS_DISPLAY_NAME@"
    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "NSIS.InstallOptions.ini"
  



More information about the Cmake-commits mailing list