summaryrefslogtreecommitdiffstats
path: root/java/src/hdf/hdf5lib
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2018-03-12 20:56:50 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2018-03-12 20:56:50 (GMT)
commitcf110b33c825f15e8a101b5772d15ec282ff85bf (patch)
tree145458939dd3c5d9460bf49a2c00979830d2ec11 /java/src/hdf/hdf5lib
parent5c4bab04f59bdb1821635e580bae3ce357cbd580 (diff)
parentaaff21ff4cef6ffe364ae62e09e5da52a90b77c2 (diff)
downloadhdf5-cf110b33c825f15e8a101b5772d15ec282ff85bf.zip
hdf5-cf110b33c825f15e8a101b5772d15ec282ff85bf.tar.gz
hdf5-cf110b33c825f15e8a101b5772d15ec282ff85bf.tar.bz2
Merge pull request #934 in HDFFV/hdf5 from hdf5_1_10_merge to hdf5_1_10
* commit 'aaff21ff4cef6ffe364ae62e09e5da52a90b77c2': (105 commits) Unify the test (t_bigio.c) between hdf5_1_10 and develop Remove comparison to NULL for variables to be freed. Add HDfree of vector, matrix_out and matrix_out1 previously HDmalloced in coll_write_test(). merged from develop merged from develop removed duplicate code Code improvement Description: - Removed memory leaks caused by accidentally invoking p_get_member_type - Added the call to test_lcpl, missed previously Platforms tested: Linux/64 (jelly) Linux/ppc64 (ostrich) Darwin (osx1010test) Updated RELEASE.txt Description: - Wrappers for H5Lcreate_soft, H5Lcreate_hard, H5Lcopy, H5Lmove, H5Ldelete, and H5Lget_info - Class LinkCreatPropList - Fixed typo in source file Platforms tested: Linux/64 (jelly) Updated for H5LcreatProp.[h,cpp] Updated MANIFEST for H5LcreatProp.[h,cpp] HDFFV-10149 continued Description: - Moved the new wrappers committed on Mar 9: 43158f3bb352f374c31556a5d0dc463a09e0b32e to H5Location and renamed some of them for overloading. This is because the loc_id in the C APIs can be file, group, dataset, named datatype, and attribute. Previous implementation was wrong following some inaccurate C API reference manual. Re-factor coding for H5P/Sencode with libver bounds. Removed commented out code from H5FDmpio.c, H5FDprivate.h and H5Fint.c Upated cpp doc. Added C++ wrappers - HDFFV-10149 Description: Added the following wrappers to class H5::Group: + H5Lcreate_soft: // Creates a soft link from link_name to target_name. void newLink(const char *target_name, const char *link_name,...) void newLink(const H5std_string& target_name,...) Improve code Description: Added notes and changed argument to H5Fcreate to clarify the latest situation Platforms tested: Linux/64 (jelly) Resolve compilation errors. Add release note Remove obsolete comments Change CMake min to 3.10 ...
Diffstat (limited to 'java/src/hdf/hdf5lib')
-rw-r--r--java/src/hdf/hdf5lib/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/hdf/hdf5lib/CMakeLists.txt b/java/src/hdf/hdf5lib/CMakeLists.txt
index 1f2587e..9506fc1 100644
--- a/java/src/hdf/hdf5lib/CMakeLists.txt
+++ b/java/src/hdf/hdf5lib/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.3.2)
+cmake_minimum_required (VERSION 3.10)
PROJECT (HDF5_JAVA_HDF_HDF5 Java)
set (CMAKE_VERBOSE_MAKEFILE 1)