diff --git a/SuperBuild/patches/GDAL/gdal-4-fixhdf5-win.diff b/SuperBuild/patches/GDAL/gdal-4-fixhdf5-win.diff deleted file mode 100644 index ecdff5829509a786ea54a8c9cbec034586c3c19b..0000000000000000000000000000000000000000 --- a/SuperBuild/patches/GDAL/gdal-4-fixhdf5-win.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- gdal-2.4.1_orig/frmts/hdf5/makefile.vc 2019-03-15 13:30:02.000000000 +0100 -+++ gdal-2.4.1/frmts/hdf5/makefile.vc 2019-04-05 17:43:22.356322797 +0200 -@@ -7,7 +7,7 @@ - - PLUGIN_DLL = gdal_HDF5.dll - --EXTRAFLAGS = -I$(HDF5_DIR)\include -DWIN32 -D_HDF5USEDLL_ -+EXTRAFLAGS = -I$(HDF5_DIR)\include -DWIN32 -DH5_BUILT_AS_DYNAMIC_LIB - - !IF "$(HDF5_PLUGIN)" == "YES" - EXTRAFLAGS = $(EXTRAFLAGS) -DHDF5_PLUGIN diff --git a/SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in b/SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in index 2276389caf9d30b3d63807f356ddbf2462147cb0..15ed78cc162e8bef10b42b97e54f50ff9a513273 100644 --- a/SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in +++ b/SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in @@ -109,6 +109,10 @@ NETCDF_INC_DIR = @SB_INSTALL_PREFIX_NATIVE@\include NETCDF_HAS_NC4 = YES NETCDF_HAS_HDF4 = YES +# Needed to define H5_BUILT_AS_DYNAMIC_LIB for windows compilation +# scenarios where it is not exported on the target (non-CMake builds) +HDF5_H5_IS_DLL = YES + # Binding list. One or several in the following list # csharp, java, python BINDINGS=python