Commit 92df3501 authored by Sean McBride's avatar Sean McBride
Browse files

BUG: 5445: tweaks on 1.2.3 upgrade: cosmetic changes to keep itk and vtk zlibs...

BUG: 5445: tweaks on 1.2.3 upgrade: cosmetic changes to keep itk and vtk zlibs as close as possible, suppress more compiler warnings, updated readme, added HAVE_UNISTD_H test, removed some warning suppression to see if the new zlib fixed them
parent 8a140637
......@@ -9,7 +9,8 @@ SET(ZLIB_SRCS
inflate.c inftrees.c trees.c uncompr.c zutil.c
)
# for windows add the .def and .rc files to the source list if building shared libs
# for windows add the .def and .rc files to the source list
# if building shared libs
IF(WIN32)
IF(BUILD_SHARED_LIBS)
SET(ZLIB_DLL 1)
......@@ -24,9 +25,9 @@ IF(WIN32)
ENDIF(WIN32)
CONFIGURE_FILE(${VTKZLIB_SOURCE_DIR}/.NoDartCoverage
${VTKZLIB_BINARY_DIR}/.NoDartCoverage)
${VTKZLIB_BINARY_DIR}/.NoDartCoverage)
CONFIGURE_FILE(${VTKZLIB_SOURCE_DIR}/zlibDllConfig.h.in
${VTKZLIB_BINARY_DIR}/zlibDllConfig.h)
${VTKZLIB_BINARY_DIR}/zlibDllConfig.h)
ADD_LIBRARY(vtkzlib ${ZLIB_SRCS})
......@@ -42,6 +43,7 @@ IF(NOT VTK_INSTALL_NO_LIBRARIES)
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL(FILES
${VTKZLIB_SOURCE_DIR}/zlib.h
......
This directory contains a subset of the zlib library (1.2.3) and
some custom changes that VTK needs.
some custom changes.
We only include enough of the distribution to provide the functionalities
required by VTK.
required.
We would like to thank the zlib team for distributing this library.
http://www.zlib.net
......@@ -36,4 +36,5 @@ vs the original zlib code
zconf.h
-Include vtk_zlib_mangle.h (at the top)
-Include vtkzlib/zlibDllConfig.h (at the top)
-Changed an #if 0 to #ifdef HAVE_UNISTD_H (near middle)
-Suppress selected compiler warnings (at the bottom)
......@@ -290,7 +290,8 @@ typedef uLong FAR uLongf;
typedef Byte *voidp;
#endif
#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */
/* KITWARE_ZLIB_CHANGE - Since VTK/ITK use CMake, not ./configure, we can go ahead and test HAVE_UNISTD_H */
#ifdef HAVE_UNISTD_H
# include <sys/types.h> /* for off_t */
# include <unistd.h> /* for SEEK_* and off_t */
# ifdef VMS
......@@ -341,12 +342,14 @@ typedef uLong FAR uLongf;
#pragma warning ( disable : 4127 ) /* cond expr is constant */
#pragma warning ( disable : 4131 ) /* Old style declaration */
#pragma warning ( disable : 4244 ) /* conversion loss of data */
#pragma warning ( disable : 4267 )
#pragma warning ( disable : 4267 ) /* conversion from 'size_t' to 'int', possible loss of data */
#endif
#if defined(__BORLANDC__)
#pragma warn -8004 /* "assigned a value that is never used" */
#pragma warn -8012 /* "comparing signed with unsigned" */
#pragma warn -8057 /* "parameter never used" */
/* #pragma warn -8004 "assigned a value that is never used" */
#pragma warn -8008 /* "Condition is always true" */
/* #pragma warn -8012 "comparing signed with unsigned" */
/* #pragma warn -8057 "parameter never used" */
#pragma warn -8066 /* "Unreachable code" */
#endif
#endif /* ZCONF_H */
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment