[cmake-commits] king committed cmCPackTGZGenerator.cxx 1.15 1.16

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CPack
In directory public:/mounts/ram/cvs-serv7338/Source/CPack

Modified Files:
	cmCPackTGZGenerator.cxx 
Log Message:
ENH: Add options to build with system utility libraries.  Organize inclusion of third party libraries into a single header per library.  This addresses bug#3653.


Index: cmCPackTGZGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTGZGenerator.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cmCPackTGZGenerator.cxx	2 May 2006 22:47:49 -0000	1.15
+++ cmCPackTGZGenerator.cxx	19 Oct 2006 19:00:08 -0000	1.16
@@ -26,7 +26,7 @@
 #include "cmCPackLog.h"
 
 #include <cmsys/SystemTools.hxx>
-#include <cmzlib/zutil.h>
+#include <cm_zlib.h>
 #include <libtar/libtar.h>
 #include <memory> // auto_ptr
 #include <fcntl.h>
@@ -94,7 +94,7 @@
     mydata->ZLibStream.opaque = Z_NULL;
     int strategy = Z_DEFAULT_STRATEGY;
     if ( deflateInit2(&mydata->ZLibStream, mydata->CompressionLevel,
-        Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy) != Z_OK )
+        Z_DEFLATED, -MAX_WBITS, 8, strategy) != Z_OK )
       {
       return -1;
       }
@@ -281,7 +281,8 @@
     const int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
     char header[11];
     sprintf(header, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
-      Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
+            Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/,
+            3 /* zlib os code for UNIX, not really used anyway */);
     os->write(header, 10);
     }
   return 1;