From 7535f5a7280630fa6e3a69ae5b7b627c05e051ef Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 10 Dec 2019 13:55:34 -0600
Subject: Fix java include, h5watch and remove clang tool.

---
 config/toolchain/clang.cmake | 18 ------------------
 hl/tools/h5watch/h5watch.c   | 21 +++++++++++----------
 java/src/jni/CMakeLists.txt  |  2 +-
 3 files changed, 12 insertions(+), 29 deletions(-)

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..59b6363 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})
-- 
cgit v0.12