diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-12-16 17:36:17 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-12-16 17:36:17 (GMT) |
| commit | c8912e3c47384de7f66d37d3e65df2e6b0915069 (patch) | |
| tree | fc43d7c099d0c1b6a4250fe661b44479d01210ad /java | |
| parent | 1cffc3ff0f3454fedf6edcdb93dcde5ed1b910d6 (diff) | |
| parent | e2349130608e013e610a750b28fb00fc92866e0c (diff) | |
| download | hdf5-c8912e3c47384de7f66d37d3e65df2e6b0915069.zip hdf5-c8912e3c47384de7f66d37d3e65df2e6b0915069.tar.gz hdf5-c8912e3c47384de7f66d37d3e65df2e6b0915069.tar.bz2 | |
Merge pull request #1376 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'e2349130608e013e610a750b28fb00fc92866e0c':
Add H5I_INVALID_HID
Manifest fix
Tools cleanup
HDFFV-10660,-10594 merge from develop
HDFFV-10632 separate stderr and stdout in tests
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/jni/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
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) |