summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-04-07 14:52:09 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-04-07 14:52:09 (GMT)
commitf502d9f7fbab50f167bcd8bbf02a4f86c7bd8c13 (patch)
treea7156065baf87070e6847e282e5fad54d10549a6 /java
parente3c71c40a70de46c6cdc2e0d06c08da9c2f95ff2 (diff)
downloadhdf5-f502d9f7fbab50f167bcd8bbf02a4f86c7bd8c13.zip
hdf5-f502d9f7fbab50f167bcd8bbf02a4f86c7bd8c13.tar.gz
hdf5-f502d9f7fbab50f167bcd8bbf02a4f86c7bd8c13.tar.bz2
TRILAB-192 - merge changes from develop
Single source, config files, for warnings for both autotools and CMake. Update CMake libraries, tools, tests to use correct flags.
Diffstat (limited to 'java')
-rw-r--r--java/src/jni/CMakeLists.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/java/src/jni/CMakeLists.txt b/java/src/jni/CMakeLists.txt
index 9440eef..a5b2d96 100644
--- a/java/src/jni/CMakeLists.txt
+++ b/java/src/jni/CMakeLists.txt
@@ -77,9 +77,7 @@ add_library (${HDF5_JAVA_JNI_LIB_TARGET} SHARED ${HDF5_JAVA_JNI_CSRCS} ${HDF5_JA
target_include_directories (${HDF5_JAVA_JNI_LIB_TARGET}
PRIVATE "${HDF5_SRC_DIR};${HDF5_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_compile_options(${HDF5_JAVA_JNI_LIB_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}")
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)