diff options
| author | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2018-03-02 23:04:02 (GMT) |
|---|---|---|
| committer | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2018-03-02 23:04:02 (GMT) |
| commit | 3dcc827771d147146a714831f63fbe12af99ce30 (patch) | |
| tree | f96444681ab9138feab82dbb88c76ee422b07664 /java/src | |
| parent | ec361559b3a78126e70ec4abd74a98d5faff53f0 (diff) | |
| parent | a30da017cc0c0d981d384afad2c074ad5a65d618 (diff) | |
| download | hdf5-3dcc827771d147146a714831f63fbe12af99ce30.zip hdf5-3dcc827771d147146a714831f63fbe12af99ce30.tar.gz hdf5-3dcc827771d147146a714831f63fbe12af99ce30.tar.bz2 | |
Merge branch 'develop' into avoid_trunc_beta
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java/src/hdf/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java/src/hdf/hdf5lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java/src/jni/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java/src/jni/h5dImp.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/java/src/CMakeLists.txt b/java/src/CMakeLists.txt index 9bdab4b..7075d32 100644 --- a/java/src/CMakeLists.txt +++ b/java/src/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.2.2) +cmake_minimum_required (VERSION 3.3.2) PROJECT ( HDF5_JAVA_SRC C Java ) #----------------------------------------------------------------------------- diff --git a/java/src/hdf/CMakeLists.txt b/java/src/hdf/CMakeLists.txt index 649f7d0..35b436d 100644 --- a/java/src/hdf/CMakeLists.txt +++ b/java/src/hdf/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.2.2) +cmake_minimum_required (VERSION 3.3.2) PROJECT (HDF5_JAVA_HDF) add_subdirectory (hdf5lib) diff --git a/java/src/hdf/hdf5lib/CMakeLists.txt b/java/src/hdf/hdf5lib/CMakeLists.txt index c856c04..1f2587e 100644 --- a/java/src/hdf/hdf5lib/CMakeLists.txt +++ b/java/src/hdf/hdf5lib/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.2.2) +cmake_minimum_required (VERSION 3.3.2) PROJECT (HDF5_JAVA_HDF_HDF5 Java) set (CMAKE_VERBOSE_MAKEFILE 1) diff --git a/java/src/jni/CMakeLists.txt b/java/src/jni/CMakeLists.txt index ea9665b..8ab275e 100644 --- a/java/src/jni/CMakeLists.txt +++ b/java/src/jni/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.2.2) +cmake_minimum_required (VERSION 3.3.2) PROJECT (HDF5_JAVA_JNI C CXX) set (HDF5_JAVA_JNI_CSRCS diff --git a/java/src/jni/h5dImp.c b/java/src/jni/h5dImp.c index 66efed0..9784055 100644 --- a/java/src/jni/h5dImp.c +++ b/java/src/jni/h5dImp.c @@ -1019,7 +1019,7 @@ Java_hdf_hdf5lib_H5_H5DreadVL } /* end else */ return (jint)status; -} /* end Java_hdf_hdf5lib_H5_H5Dread_1VLStrings */ +} /* end Java_hdf_hdf5lib_H5_H5Dread_1VL */ herr_t H5DreadVL_asstr |