diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-05-22 13:53:14 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-05-22 13:53:14 (GMT) |
| commit | f4c33600ab91e0511898d2bd3a5473aaf7dcd2f7 (patch) | |
| tree | 31c2106d670d958e1588ce11f02b65788cb8d000 /java/examples | |
| parent | 73d7f7e7d37b869ce9c39cc8e648ef50d563fc93 (diff) | |
| parent | 926260763940c77cf8f94807823765a3624fa29d (diff) | |
| download | hdf5-f4c33600ab91e0511898d2bd3a5473aaf7dcd2f7.zip hdf5-f4c33600ab91e0511898d2bd3a5473aaf7dcd2f7.tar.gz hdf5-f4c33600ab91e0511898d2bd3a5473aaf7dcd2f7.tar.bz2 | |
Merge pull request #1066 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '926260763940c77cf8f94807823765a3624fa29d':
HDFFV-9739 fix copy testfiles command
HDFFV-9739 remove obsolete test files
HDFFV-9739 dup test file for concurrent tests
HDFFV-9739 Fix autotools script
HDFFV-9739 Change autotools test scripts
Fix typo
HDFFV-9739 Update test reference
Update current windows test machines
HDFFV-9739 Grab err number before API call
HDFFV-9739 Add release note
Adjust test names for concurrent tests
Fix soversion
HDFFV-9739 Fix copy name
HDFFV-9739 factor out tests into separate JUnit
Fix MPI on Windows by adding MPI include folder
Diffstat (limited to 'java/examples')
| -rw-r--r-- | java/examples/datasets/CMakeLists.txt | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/java/examples/datasets/CMakeLists.txt b/java/examples/datasets/CMakeLists.txt index 5ac241a..1375372 100644 --- a/java/examples/datasets/CMakeLists.txt +++ b/java/examples/datasets/CMakeLists.txt @@ -10,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 @@ -24,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 () @@ -80,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 ( @@ -118,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 () |