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.

This commit is contained in:
Brad King
2006-10-19 15:00:10 -04:00
parent de007ef199
commit f91b3c1daa
18 changed files with 321 additions and 72 deletions
+5 -5
View File
@@ -27,7 +27,7 @@
#endif
#if defined(CMAKE_BUILD_WITH_CMAKE)
# include <cmzlib/zlib.h>
# include <cm_zlib.h>
#endif
//----------------------------------------------------------------------------
@@ -213,7 +213,7 @@ void cmGeneratedFileStreamBase::Close()
int cmGeneratedFileStreamBase::CompressFile(const char* oldname,
const char* newname)
{
gzFile gf = cm_zlib_gzopen(newname, "w");
gzFile gf = gzopen(newname, "w");
if ( !gf )
{
return 0;
@@ -228,15 +228,15 @@ int cmGeneratedFileStreamBase::CompressFile(const char* oldname,
char buffer[BUFFER_SIZE];
while ( (res = fread(buffer, 1, BUFFER_SIZE, ifs)) > 0 )
{
if ( !cm_zlib_gzwrite(gf, buffer, res) )
if ( !gzwrite(gf, buffer, res) )
{
fclose(ifs);
cm_zlib_gzclose(gf);
gzclose(gf);
return 0;
}
}
fclose(ifs);
cm_zlib_gzclose(gf);
gzclose(gf);
return 1;
}
#else