[svn-r9158] Purpose:

New feature.

Description:
Before this update, to link HDF5 with zlib and szip libraries and DLLs,
zlib.lib szlib.lib were added into Object/library modules in more than
50 windows projects settings; c:\zlib114\dll\zlib.lib szlibdll.lib were
added into Object/library modules in hdf5dll project settings.

With the above settings, if we want to disable zlib and/or szip libraries
and DLLs from HDF5, we have to remove zlib.lib szlib.lib from Object/library
modules in more than 50 projects settings; c:\zlib114\dll\zlib.lib szlibdll.lib
also need to remove from hdf5dll project settings.

The above operations should be done for both release and debug versions.
So it is really very unconvenient to disable zlib and/or szip libraries and DLLs.

Solution:
Add HDF5_EXT_LIBS environment variable and replace zlib.lib szlib.lib
in Object/library modules with $(HDF5_EXT_LIBS)

Add HDF5_EXT_LIBS_DLL environment variable and replace c:\zlib114\dll\zlib.lib
szlibdll.lib in Oject/library modules with $(HDF5_EXT_LIBS_DLL).

If we want to enable both zlib and szip, set
HDF5_EXT_LIBS = zlib.lib szlib.lib
HDF5_EXT_LIBS_DLL = c:\zlib114\dll\zlib.lib szlibdll.lib

If we want to enable zlib and disable szip, set
HDF5_EXT_LIBS = zlib.lib
HDF5_EXT_LIBS_DLL = c:\zlib114\dll\zlib.lib

If we want to disable zlib and enable szip, set
HDF5_EXT_LIBS = szlib.lib
HDF5_EXT_LIBS_DLL = szlibdll.lib

If we want to disable both zlib and szip, set
HDF5_EXT_LIBS =
HDF5_EXT_LIBS_DLL =

Platforms tested:
Tested with Microsoft Visual C++ 6.0/DEC Fortran 6.0 and .NET on Windows XP and
Visual C++ 6.0/DEC Fortran 6.0 on Windows 2000 for all the possible 4 zlib/szip
enable/disable combinations:
1. Enable both
2. Enable zlib and disable szip
3. Disable zlib and enable szip
4. Disable both

Misc. update:
This commit is contained in:
Xuan Bai 2004-08-25 22:45:16 -05:00
parent 22d00ce23f
commit 6a452a343f

Binary file not shown.