diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-04-07 14:47:29 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-04-07 14:47:29 (GMT) |
| commit | 6108186feb0876c1ef3cd9cf09dca691fa609f87 (patch) | |
| tree | d80c9fbbb2c1c3a476d0f076015af1538e3d5acf /java | |
| parent | d2b7bacea1d18526f1a21b344b07e1a8305f6bd6 (diff) | |
| download | hdf5-6108186feb0876c1ef3cd9cf09dca691fa609f87.zip hdf5-6108186feb0876c1ef3cd9cf09dca691fa609f87.tar.gz hdf5-6108186feb0876c1ef3cd9cf09dca691fa609f87.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.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/java/src/jni/CMakeLists.txt b/java/src/jni/CMakeLists.txt index dc9b223..3f71122 100644 --- a/java/src/jni/CMakeLists.txt +++ b/java/src/jni/CMakeLists.txt @@ -79,9 +79,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) |