diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2020-03-28 01:19:22 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2020-03-28 01:19:22 (GMT) |
| commit | 2a06f943779fd3cc04d93ad6ec9a94a28035c50d (patch) | |
| tree | e814a5df1a7e5225e5f0434e67dc9d7a966f2349 /tools/src/h5format_convert | |
| parent | feb0f521b16b79485c22c86a630a1d91cb680a61 (diff) | |
| parent | f5cb547825e462c3299b6f41d03a71aa6faef950 (diff) | |
| download | hdf5-2a06f943779fd3cc04d93ad6ec9a94a28035c50d.zip hdf5-2a06f943779fd3cc04d93ad6ec9a94a28035c50d.tar.gz hdf5-2a06f943779fd3cc04d93ad6ec9a94a28035c50d.tar.bz2 | |
Merge pull request #2476 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:tools_vol_update to tools_vol_update
* commit 'f5cb547825e462c3299b6f41d03a71aa6faef950': (29 commits)
Minor renaming in h5dump (addr --> token)
Correct macro check
Add extensive warnings to tools executables
Reorg comments
Correct warning flag form
Because of tools macro, this needs to be a warning
unused set-variable in macro
Fix Werror issues in JNI and tools
TRILAB-192 fix JNI shadow warning
TRILAB-192 restrict extensive warnings to libraries
TRILAB-24 use CHECK_STRUCT_HAS_MEMBER
TRILAB-192 add release note
TRILAB-192 Identify warnings that fail as errors
Correct failure when allocation tracking are disabled.
Update the MANIFEST for the autoconf/cmake shared warnings files.
Correct syntax
Update CMake compiler flags to use same set of warnings
Revise API for H5get_alloc_stats() to take a struct instead of separate values.
Allow use of INTEL icl/icl++ for clang
Move the GNU warnings configuration under config/gnu-warnings/ and trim the filename prefixes. Update config/gnu-flags to suit.
...
Diffstat (limited to 'tools/src/h5format_convert')
| -rw-r--r-- | tools/src/h5format_convert/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/src/h5format_convert/CMakeLists.txt b/tools/src/h5format_convert/CMakeLists.txt index 70c07ee..863ecbe 100644 --- a/tools/src/h5format_convert/CMakeLists.txt +++ b/tools/src/h5format_convert/CMakeLists.txt @@ -7,6 +7,7 @@ project (HDF5_TOOLS_SRC_H5FC C) if (NOT ONLY_SHARED_LIBS) add_executable (h5format_convert ${HDF5_TOOLS_SRC_H5FC_SOURCE_DIR}/h5format_convert.c) target_include_directories (h5format_convert PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") + target_compile_options(h5format_convert PRIVATE "${HDF5_CMAKE_C_FLAGS}") TARGET_C_PROPERTIES (h5format_convert STATIC) target_link_libraries (h5format_convert PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) set_target_properties (h5format_convert PROPERTIES FOLDER tools) @@ -17,6 +18,7 @@ endif () if (BUILD_SHARED_LIBS) add_executable (h5format_convert-shared ${HDF5_TOOLS_SRC_H5FC_SOURCE_DIR}/h5format_convert.c) target_include_directories (h5format_convert-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") + target_compile_options(h5format_convert-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}") TARGET_C_PROPERTIES (h5format_convert-shared SHARED) target_link_libraries (h5format_convert-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) set_target_properties (h5format_convert-shared PROPERTIES FOLDER tools) |