diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2018-12-13 23:32:39 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2018-12-13 23:32:39 (GMT) |
| commit | 833a4f73fd8dc696f8bf500cd842d88949bb1519 (patch) | |
| tree | 6475fcaa55b564015344a50f2939be2fe539d876 /java | |
| parent | 247a6afb7e7fb1bc08a31cb7edbbea5f5b44eb93 (diff) | |
| parent | dd6c06f9a7713ec77a0d9bf64852c6d58584ad27 (diff) | |
| download | hdf5-833a4f73fd8dc696f8bf500cd842d88949bb1519.zip hdf5-833a4f73fd8dc696f8bf500cd842d88949bb1519.tar.gz hdf5-833a4f73fd8dc696f8bf500cd842d88949bb1519.tar.bz2 | |
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/hdf/hdf5lib/H5.java | 1 | ||||
| -rw-r--r-- | java/src/jni/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java index 99de786..1138e50 100644 --- a/java/src/hdf/hdf5lib/H5.java +++ b/java/src/hdf/hdf5lib/H5.java @@ -1175,7 +1175,6 @@ public class H5 implements java.io.Serializable { public synchronized static native int H5Aread_reg_ref(long attr_id, long mem_type_id, String[] buf) throws HDF5LibraryException, NullPointerException; - throws HDF5LibraryException, NullPointerException; public synchronized static native int H5Aread_short(long attr_id, long mem_type_id, short[] buf, boolean isCriticalPinning) throws HDF5LibraryException, NullPointerException; diff --git a/java/src/jni/CMakeLists.txt b/java/src/jni/CMakeLists.txt index 7b95e0b..50e76e1 100644 --- a/java/src/jni/CMakeLists.txt +++ b/java/src/jni/CMakeLists.txt @@ -48,7 +48,9 @@ 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}) +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}>" +) TARGET_C_PROPERTIES (${HDF5_JAVA_JNI_LIB_TARGET} SHARED) target_link_libraries (${HDF5_JAVA_JNI_LIB_TARGET} PUBLIC ${HDF5_LIBSH_TARGET}) set_target_properties (${HDF5_JAVA_JNI_LIB_TARGET} PROPERTIES FOLDER libraries/jni) |