diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2019-12-11 05:44:30 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2019-12-11 05:44:30 (GMT) |
| commit | 6b670e353c1ea7f13ef72cc4297d9973102078bb (patch) | |
| tree | 9055f1cfcdf479509cde6a0d2c86dd2a7ab8cefe /java/src | |
| parent | eb415973e81605e3c15bbb954d57dd5d42ad449c (diff) | |
| parent | f2ef40feb8d1f5f31ab60f78bb37d2ba595aacb8 (diff) | |
| download | hdf5-6b670e353c1ea7f13ef72cc4297d9973102078bb.zip hdf5-6b670e353c1ea7f13ef72cc4297d9973102078bb.tar.gz hdf5-6b670e353c1ea7f13ef72cc4297d9973102078bb.tar.bz2 | |
Merge pull request #2123 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f2ef40feb8d1f5f31ab60f78bb37d2ba595aacb8':
Correct assignment
Fix java include, h5watch and remove clang tool.
Add missing filenames
Diffstat (limited to 'java/src')
| -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}) |