[cmake-commits] king committed NSIS.template.in 1.20 1.21

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Oct 13 15:04:23 EDT 2006


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

Modified Files:
	NSIS.template.in 
Log Message:
BUG: Compression must be set before any output is created.


Index: NSIS.template.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/NSIS.template.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- NSIS.template.in	12 Oct 2006 18:59:43 -0000	1.20
+++ NSIS.template.in	13 Oct 2006 19:04:18 -0000	1.21
@@ -27,6 +27,16 @@
   InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"  
 
 ;--------------------------------
+;General
+
+  ;Name and file
+  Name "@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+  OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
+
+  ;Set compression
+  SetCompressor @CPACK_NSIS_COMPRESSOR@
+
+;--------------------------------
 ; determine admin versus local install
 ; Is install for "AllUsers" or "JustMe"?
 ; Default to "JustMe" - set to "AllUsers" if admin or on Win9x
@@ -72,16 +82,6 @@
 FunctionEnd
 
 ;--------------------------------
-;General
-
-  ;Name and file
-  Name "@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-  OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
-
-  ;Set compression
-  SetCompressor @CPACK_NSIS_COMPRESSOR@
-
-;--------------------------------
 ;Interface Settings
 
   !define MUI_HEADERIMAGE



More information about the Cmake-commits mailing list