diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-03-20 18:00:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-20 18:00:00 (GMT) |
| commit | 1ffaa38174b0f784b7ed6a471f40bf0e749ceac3 (patch) | |
| tree | 7862edd79409afc7806996f166aa6bb7cd2088e9 /java/src | |
| parent | c01e27cd8ea443a6ddf68ca1052a491692e28ae9 (diff) | |
| download | hdf5-1ffaa38174b0f784b7ed6a471f40bf0e749ceac3.zip hdf5-1ffaa38174b0f784b7ed6a471f40bf0e749ceac3.tar.gz hdf5-1ffaa38174b0f784b7ed6a471f40bf0e749ceac3.tar.bz2 | |
Gather latest CMake changes from develop (#2609)
Add HDF5_SRC_INCLUDE_DIRS variable
cleanup cmake comments and documentation
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/hdf/hdf5lib/exceptions/package-info.java | 2 | ||||
| -rw-r--r-- | java/src/hdf/hdf5lib/structs/H5FD_hdfs_fapl_t.java | 1 | ||||
| -rw-r--r-- | java/src/hdf/hdf5lib/structs/H5FD_ros3_fapl_t.java | 1 | ||||
| -rw-r--r-- | java/src/jni/CMakeLists.txt | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/java/src/hdf/hdf5lib/exceptions/package-info.java b/java/src/hdf/hdf5lib/exceptions/package-info.java index fa261ca..784e57d 100644 --- a/java/src/hdf/hdf5lib/exceptions/package-info.java +++ b/java/src/hdf/hdf5lib/exceptions/package-info.java @@ -28,4 +28,4 @@ * error code returned by the HDF5 library. * */ -package hdf.hdf5lib.exceptions;
\ No newline at end of file +package hdf.hdf5lib.exceptions; diff --git a/java/src/hdf/hdf5lib/structs/H5FD_hdfs_fapl_t.java b/java/src/hdf/hdf5lib/structs/H5FD_hdfs_fapl_t.java index 181d681..9861334 100644 --- a/java/src/hdf/hdf5lib/structs/H5FD_hdfs_fapl_t.java +++ b/java/src/hdf/hdf5lib/structs/H5FD_hdfs_fapl_t.java @@ -1,6 +1,5 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * - * * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/java/src/hdf/hdf5lib/structs/H5FD_ros3_fapl_t.java b/java/src/hdf/hdf5lib/structs/H5FD_ros3_fapl_t.java index 67c2463..62b2921 100644 --- a/java/src/hdf/hdf5lib/structs/H5FD_ros3_fapl_t.java +++ b/java/src/hdf/hdf5lib/structs/H5FD_ros3_fapl_t.java @@ -1,6 +1,5 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * - * * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/java/src/jni/CMakeLists.txt b/java/src/jni/CMakeLists.txt index 5d6aebf..56a1ab8 100644 --- a/java/src/jni/CMakeLists.txt +++ b/java/src/jni/CMakeLists.txt @@ -76,7 +76,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_SRC_DIR};${HDF5_SRC_BINARY_DIR};${HDF5_JAVA_JNI_SOURCE_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>" + PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};${HDF5_JAVA_JNI_SOURCE_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>" ) target_compile_options(${HDF5_JAVA_JNI_LIB_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}") TARGET_C_PROPERTIES (${HDF5_JAVA_JNI_LIB_TARGET} SHARED) |