diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-12-11 14:29:33 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-12-11 14:29:33 (GMT) |
| commit | 51e799551309e16558297469edef6e2d232a3246 (patch) | |
| tree | 88700302850919c523aece7460a92bf5d3fbc7ee /java | |
| parent | b260e2969f40a30a205ba105fba97d99d78e3b65 (diff) | |
| parent | 6b670e353c1ea7f13ef72cc4297d9973102078bb (diff) | |
| download | hdf5-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
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/jni/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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}) |