HDFFV-10876 Merge from develop

2019-12-08 14:00:04 -06:00
parent dbd6fb0ba6
commit 310b42e35a
93 changed files with 6249 additions and 3916 deletions
--- a/config/cmake_ext_mod/ConfigureChecks.cmake
+++ b/config/cmake_ext_mod/ConfigureChecks.cmake
@@ -83,9 +83,6 @@ endif ()
 if (WINDOWS)
  set (HDF5_REQUIRED_LIBRARIES "ws2_32.lib;wsock32.lib")
  set (${HDF_PREFIX}_HAVE_WIN32_API 1)
-  set (${HDF_PREFIX}_HAVE_STDDEF_H 1)
-  set (${HDF_PREFIX}_HAVE_SYS_STAT_H 1)
-  set (${HDF_PREFIX}_HAVE_SYS_TYPES_H 1)
  set (${HDF_PREFIX}_HAVE_LIBM 1)
  set (${HDF_PREFIX}_HAVE_STRDUP 1)
  set (${HDF_PREFIX}_HAVE_SYSTEM 1)