Replace use of HAVE_HDF5_H feature macro with USE_HDF5

cmake/dependencies.cmake

@@ -320,16 +320,9 @@ if(USE_HDF5)
     set(HAS_PAR_FILTERS no CACHE STRING "" )
   endif()
 
-  set(HAVE_HDF5_H ${HDF5_C_INCLUDE_DIR})
   target_include_directories(netcdf
     PRIVATE
-    ${HAVE_HDF5_H}
-  )
-
-  #option to include HDF5 High Level header file (hdf5_hl.h) in case we are not doing a make install
-  target_include_directories(netcdf
-    PRIVATE
-      ${HDF5_HL_INCLUDE_DIR}
+    ${HDF5_INCLUDE_DIRS}
   )
 
 endif(USE_HDF5)

config.h.cmake.in

@@ -283,12 +283,6 @@ are set when opening a binary file on Windows. */
 /* Define to 1 if you have libsz */
 #cmakedefine HAVE_SZ 1
 
-/* Define to 1 if you have the <hdf5.h> header file. */
-#cmakedefine HAVE_HDF5_H 1
-
-/* Define to 1 if you have the <hdf5.h> header file. */
-#cmakedefine HAVE_HDF5_HL_H 1
-
 /* Define to 1 if the system has the type `int64'. */
 #cmakedefine HAVE_INT64 1
 

nc_test4/test_filter_vlen.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #endif
 #include "netcdf.h"

nc_test4/tst_filter_vlen.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #endif
 #include "netcdf.h"

nczarr_test/ncdumpchunks.c

@@ -23,7 +23,7 @@
 #include "ncpathmgr.h"
 #include "nclog.h"
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #include <H5DSpublic.h>
 #endif

nczarr_test/test_chunkcases.c

@@ -8,11 +8,6 @@
 #include "ncpathmgr.h"
 #include "nclist.h"
 
-#ifdef HAVE_HDF5_H
-#include <hdf5.h>
-#include <H5DSpublic.h>
-#endif
-
 #ifdef ENABLE_NCZARR
 #include "zincludes.h"
 #endif

nczarr_test/test_unlim_io.c

@@ -9,11 +9,6 @@
 #include "ncpathmgr.h"
 #include "nclist.h"
 
-#ifdef HAVE_HDF5_H
-#include <hdf5.h>
-#include <H5DSpublic.h>
-#endif
-
 #ifdef ENABLE_NCZARR
 #include "zincludes.h"
 #endif

nczarr_test/test_utils.c

@@ -18,7 +18,7 @@
 #include "XGetopt.h"
 #endif
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #include <H5DSpublic.h>
 #endif

nczarr_test/testfilter.c

@@ -38,15 +38,10 @@ data:
 \endcode
 */
 
-#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_HDF5_H
-#include <hdf5.h>
-#endif
-
 #include "netcdf.h"
 
 /* The HDF assigned id for bzip compression */

nczarr_test/testfilter_misc.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #endif
 

nczarr_test/testfilter_multi.c

@@ -12,7 +12,7 @@ Test support for multiple filters per variable
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #endif