summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-06-20 11:55:05 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-06-20 11:55:05 (GMT)
commit7ee92d580510a7d90db7f3be8d2061c9c8f09a1b (patch)
treee810e42048e557b954b713185c40793938f8d375 /java
parentc2a744995125e308f1a37d6daaa9749126cf9f60 (diff)
downloadhdf5-7ee92d580510a7d90db7f3be8d2061c9c8f09a1b.zip
hdf5-7ee92d580510a7d90db7f3be8d2061c9c8f09a1b.tar.gz
hdf5-7ee92d580510a7d90db7f3be8d2061c9c8f09a1b.tar.bz2
HDFFV-10805 Merge SHARED ONLY option from develop
Diffstat (limited to 'java')
-rw-r--r--java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java2
-rw-r--r--java/src/jni/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java b/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java
index 3a1361a..17a81e9 100644
--- a/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java
+++ b/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java
@@ -262,7 +262,7 @@ public class HDF5LibraryException extends HDF5Exception {
return "unrecognized message";
}
else if (err_code == HDF5Constants.H5E_CANTDELETE) {
- return " Can't delete message";
+ return "Can't delete message";
}
else if (err_code == HDF5Constants.H5E_CANTOPENOBJ) {
return "Can't open object";
diff --git a/java/src/jni/CMakeLists.txt b/java/src/jni/CMakeLists.txt
index ca48fa6..f3e6012 100644
--- a/java/src/jni/CMakeLists.txt
+++ b/java/src/jni/CMakeLists.txt
@@ -74,7 +74,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}
+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)