summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-12-11 14:29:33 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-12-11 14:29:33 (GMT)
commit51e799551309e16558297469edef6e2d232a3246 (patch)
tree88700302850919c523aece7460a92bf5d3fbc7ee
parentb260e2969f40a30a205ba105fba97d99d78e3b65 (diff)
parent6b670e353c1ea7f13ef72cc4297d9973102078bb (diff)
downloadhdf5-51e799551309e16558297469edef6e2d232a3246.zip
hdf5-51e799551309e16558297469edef6e2d232a3246.tar.gz
hdf5-51e799551309e16558297469edef6e2d232a3246.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '6b670e353c1ea7f13ef72cc4297d9973102078bb': Correct assignment Fix java include, h5watch and remove clang tool. Add missing filenames
-rw-r--r--MANIFEST5
-rw-r--r--config/toolchain/clang.cmake18
-rw-r--r--hl/tools/h5watch/h5watch.c21
-rw-r--r--java/src/jni/CMakeLists.txt2
4 files changed, 15 insertions, 31 deletions
diff --git a/MANIFEST b/MANIFEST
index 8647002..b99954d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1344,6 +1344,7 @@
./testpar/t_prestart.c
./testpar/t_span_tree.c
./testpar/t_init_term.c
+./testpar/t_2Gio.c
./testpar/testpar.h
./testpar/testpflush.sh.in
./testpar/testphdf5.c
@@ -2650,8 +2651,8 @@
./tools/test/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl
./tools/test/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl
./tools/test/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl
-./tools/test/h5repack/testfiles/attrregion.tattrreg.h5
-./tools/test/h5repack/testfiles/dataregion.tdatareg.h5
+./tools/test/h5repack/testfiles/attrregion.tattrreg.h5.ddl
+./tools/test/h5repack/testfiles/dataregion.tdatareg.h5.ddl
# jam utility and tests
./tools/src/h5jam/Makefile.am
diff --git a/config/toolchain/clang.cmake b/config/toolchain/clang.cmake
index f9da787..5e3b13a 100644
--- a/config/toolchain/clang.cmake
+++ b/config/toolchain/clang.cmake
@@ -7,23 +7,5 @@ set(CMAKE_C_COMPILER clang)
set(CMAKE_CXX_COMPILER clang++)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-find_program(
- CLANG_TIDY_EXE
- NAMES "clang-tidy"
- DOC "Path to clang-tidy executable"
-)
-
-set(CMAKE_C_CLANG_TIDY "${CLANG_TIDY_EXE}" -checks=*,clang-analyzer-*,-clang-analyzer-cplusplus*,-readability-*,-google*)
-set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_EXE}" -checks=*,clang-analyzer-*,-clang-analyzer-cplusplus*,-readability-*,-google*)
-
-#find_program(
-# CLANG_FORMAT_EXE
-# NAMES "clang-format"
-# DOC "Path to clang-format executable"
-#)
-#
-#set(CMAKE_C_CLANG_FORMAT "${CLANG_FORMAT_EXE}")
-#set(CMAKE_CXX_CLANG_FORMAT "${CLANG_FORMAT_EXE}")
-
# the following is used if cross-compiling
set(CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/hl/tools/h5watch/h5watch.c b/hl/tools/h5watch/h5watch.c
index ef0d5d6..b7f583c 100644
--- a/hl/tools/h5watch/h5watch.c
+++ b/hl/tools/h5watch/h5watch.c
@@ -132,22 +132,23 @@ doprint(hid_t did, hsize_t *start, hsize_t *block, int rank)
int i; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- HDmemset(&ctx, 0, sizeof(ctx));
-
/* Subsetting information for the tools library printing routines */
- ctx.sset->start.data = ss_start;
- ctx.sset->stride.data = ss_stride;
- ctx.sset->block.data = ss_block;
- ctx.sset->count.data = ss_count;
+ subset.start.data = ss_start;
+ subset.stride.data = ss_stride;
+ subset.block.data = ss_block;
+ subset.count.data = ss_count;
/* Initialize subsetting information */
for(i = 0; i < rank; i++) {
- ctx.sset->stride.data[i] = 1;
- ctx.sset->count.data[i] = 1;
- ctx.sset->start.data[i] = start[i];
- ctx.sset->block.data[i] = block[i];
+ subset.stride.data[i] = 1;
+ subset.count.data[i] = 1;
+ subset.start.data[i] = start[i];
+ subset.block.data[i] = block[i];
} /* end for */
+ HDmemset(&ctx, 0, sizeof(ctx));
+ ctx.sset = &subset;
+
/* Set to all default values and then override */
HDmemset(&info, 0, sizeof info);
diff --git a/java/src/jni/CMakeLists.txt b/java/src/jni/CMakeLists.txt
index a05921b..ac41bfb 100644
--- a/java/src/jni/CMakeLists.txt
+++ b/java/src/jni/CMakeLists.txt
@@ -77,7 +77,7 @@ set (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON)
########### JNI libraries always must be built shared ###############
add_library (${HDF5_JAVA_JNI_LIB_TARGET} SHARED ${HDF5_JAVA_JNI_CSRCS} ${HDF5_JAVA_JNI_CHDRS})
target_include_directories (${HDF5_JAVA_JNI_LIB_TARGET}
- PRIVATE "${HDF5_BINARY_DIR};${HDF5_JAVA_JNI_SOURCE_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+ PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};${HDF5_JAVA_JNI_SOURCE_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
)
TARGET_C_PROPERTIES (${HDF5_JAVA_JNI_LIB_TARGET} SHARED)
target_link_libraries (${HDF5_JAVA_JNI_LIB_TARGET} PUBLIC ${HDF5_LIBSH_TARGET})