Merge branch 'hdf5_1_12_1' of https://github.com/HDFGroup/hdf5 into h…

…df5_1_12_1
HDFGroup · May 18, 2021 · 096eb24 · 096eb24
2 parents ad49f99 + 749407b
commit 096eb24
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
@@ -136,21 +136,25 @@ set (f90CStub_C_HDRS
     ${HDF5_F90_SRC_SOURCE_DIR}/H5f90proto.h
 )
 
-set (f90CStub_CGEN_HDRS
-    # generated files
-    ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h
-)
-add_custom_target (H5gen_i ALL
-    DEPENDS H5match_types ${f90CStub_CGEN_HDRS}
-)
+if (NOT ONLY_SHARED_LIBS)
+  set (f90CStub_CGEN_HDRS
+      # generated files
+      ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h
+  )
+  add_custom_target (H5gen_i ALL
+      DEPENDS H5match_types ${f90CStub_CGEN_HDRS}
+  )
+endif ()
 
-set (f90CStub_CGEN_SHHDRS
-    # generated files
-    ${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h
-)
-add_custom_target (H5gen_iSH ALL
-    DEPENDS H5match_types ${f90CStub_CGEN_SHHDRS}
-)
+if (BUILD_SHARED_LIBS)
+  set (f90CStub_CGEN_SHHDRS
+      # generated files
+      ${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h
+  )
+  add_custom_target (H5gen_iSH ALL
+      DEPENDS H5match_types ${f90CStub_CGEN_SHHDRS}
+  )
+endif ()
 
 if (NOT ONLY_SHARED_LIBS)
   add_library (${HDF5_F90_C_LIB_TARGET} STATIC ${f90CStub_C_SOURCES} ${f90CStub_C_HDRS} ${f90CStub_CGEN_HDRS})

diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake
@@ -1549,7 +1549,7 @@ ADD_H5_TEST (h5diff_801 1 -v ${FILE7} ${FILE8A} /g1/array /g1/array)
 # ##############################################################################
 # # dataset subsets
 # ##############################################################################
-ADD_H5_TEST (h5diff_830 1 --enable-error-stack -v ${FILE7} ${FILE8} /g1/array3D[0,0,0;2,2,1;2,2,2;] /g1/array3D[0,0,0;2,2,1;2,2,2;])
+#ADD_H5_TEST (h5diff_830 1 --enable-error-stack -v ${FILE7} ${FILE8} /g1/array3D[0,0,0;2,2,1;2,2,2;] /g1/array3D[0,0,0;2,2,1;2,2,2;])
 
 # ##############################################################################
 # # VDS tests