diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-12-13 21:50:13 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-12-13 21:50:13 (GMT) |
| commit | 0e5ac5fe2ff3faadeab97719baae2ad9f986b622 (patch) | |
| tree | 07404e07b6b5064212e7a6149c926f8b27553198 /java | |
| parent | bc4e1c2e5498c099634a4f9315814dc543a1c284 (diff) | |
| download | hdf5-0e5ac5fe2ff3faadeab97719baae2ad9f986b622.zip hdf5-0e5ac5fe2ff3faadeab97719baae2ad9f986b622.tar.gz hdf5-0e5ac5fe2ff3faadeab97719baae2ad9f986b622.tar.bz2 | |
HDFFV-10660,-10594 merge from develop
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) |