HDFFV-9739 and cmake improvements merge from develop

java/examples/datasets/CMakeLists.txt

@@ -1,13 +1,8 @@
 cmake_minimum_required (VERSION 3.10)
-PROJECT (HDFJAVA_EXAMPLES_DATASETS Java)
+project (HDFJAVA_EXAMPLES_DATASETS Java)
 
 set (CMAKE_VERBOSE_MAKEFILE 1)
 
-INCLUDE_DIRECTORIES (
-    ${HDF5_JAVA_JNI_BINARY_DIR}
-    ${HDF5_JAVA_HDF5_LIB_DIR}
-)
-
 set (HDF_JAVA_EXAMPLES
     H5Ex_D_Alloc
     H5Ex_D_Checksum
@@ -15,13 +10,9 @@ set (HDF_JAVA_EXAMPLES
     H5Ex_D_Compact
     H5Ex_D_External
     H5Ex_D_FillValue
-    H5Ex_D_Gzip
     H5Ex_D_Hyperslab
     H5Ex_D_ReadWrite
-    H5Ex_D_Shuffle
-    H5Ex_D_Szip
     H5Ex_D_UnlimitedAdd
-    H5Ex_D_UnlimitedGzip
     H5Ex_D_UnlimitedMod
     H5Ex_D_Nbit
     H5Ex_D_Transform
@@ -29,6 +20,25 @@ set (HDF_JAVA_EXAMPLES
     H5Ex_D_Soint
 )
 
+set (HDF_JAVA_ZLIB_EXAMPLES
+    H5Ex_D_Gzip
+    H5Ex_D_Shuffle
+    H5Ex_D_UnlimitedGzip
+)
+
+set (HDF_JAVA_SZIP_EXAMPLES
+    H5Ex_D_Szip
+)
+
+# detect whether the encoder is present.
+  if (H5_HAVE_FILTER_DEFLATE)
+    set (${HDF_JAVA_EXAMPLES} ${HDF_JAVA_EXAMPLES} ${HDF_JAVA_ZLIB_EXAMPLES})
+  endif ()
+
+  if (H5_HAVE_FILTER_SZIP)
+    set (${HDF_JAVA_EXAMPLES} ${HDF_JAVA_EXAMPLES} ${HDF_JAVA_SZIP_EXAMPLES})
+  endif (H5_HAVE_FILTER_SZIP)
+
 if (WIN32)
   set (CMAKE_JAVA_INCLUDE_FLAG_SEP ";")
 else ()
@@ -85,15 +95,6 @@ ENDMACRO ()
 
 if (BUILD_TESTING)
 
-# detect whether the encoder is present.
-  if (H5_HAVE_FILTER_DEFLATE)
-    set (USE_FILTER_DEFLATE "true")
-  endif ()
-
-  if (H5_HAVE_FILTER_SZIP)
-    set (USE_FILTER_SZIP "true")
-  endif (H5_HAVE_FILTER_SZIP)
-
   foreach (example ${HDF_JAVA_EXAMPLES})
     if ("${example}" STREQUAL "H5Ex_D_External")
       add_test (
@@ -123,13 +124,7 @@ if (BUILD_TESTING)
     )
     set_tests_properties (JAVA_datasets-${example}-copy-objects PROPERTIES DEPENDS JAVA_datasets-${example}-clear-objects)
     set (last_test "JAVA_datasets-${example}-copy-objects")
-    if ("${example}" STREQUAL "H5Ex_D_Szip")
-      if (USE_FILTER_SZIP)
-        ADD_H5_TEST (${example} 0)
-      endif ()
-    else ()
-      ADD_H5_TEST (${example} 0)
-    endif ()
+    ADD_H5_TEST (${example} 0)
 
   endforeach ()
 endif ()