diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-01-29 22:25:16 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-01-29 22:25:16 (GMT) |
| commit | 1255363e9be3280108a351d97237de13755d6368 (patch) | |
| tree | 4e71abdc2784be2af5af67d618de3aa8b2bc26c2 /tools/src | |
| parent | 30ca0cdc9a0b1f7fc1521007c65d9baeb69c9a23 (diff) | |
| parent | c5e2d975734d6e7a88fb48b76ec7e11d0a7763de (diff) | |
| download | hdf5-1255363e9be3280108a351d97237de13755d6368.zip hdf5-1255363e9be3280108a351d97237de13755d6368.tar.gz hdf5-1255363e9be3280108a351d97237de13755d6368.tar.bz2 | |
Merge pull request #2326 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'c5e2d975734d6e7a88fb48b76ec7e11d0a7763de':
Small fixes for tools and skip autotools tests for no filter
Correctly manage warnings for new tests
Ext libs ZLIB and SZIP warnings are separate concerns
Diffstat (limited to 'tools/src')
| -rw-r--r-- | tools/src/h5diff/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/src/h5diff/CMakeLists.txt b/tools/src/h5diff/CMakeLists.txt index c1021e4..2009a14 100644 --- a/tools/src/h5diff/CMakeLists.txt +++ b/tools/src/h5diff/CMakeLists.txt @@ -10,7 +10,7 @@ if (NOT ONLY_SHARED_LIBS) ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c ) target_include_directories (h5diff PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") - #target_compile_definitions(h5diff PRIVATE H5_TOOLS_DEBUG) + #target_compile_definitions (h5diff PRIVATE H5_TOOLS_DEBUG) TARGET_C_PROPERTIES (h5diff STATIC) target_link_libraries (h5diff PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) set_target_properties (h5diff PROPERTIES FOLDER tools) @@ -24,7 +24,7 @@ if (BUILD_SHARED_LIBS) ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c ) target_include_directories (h5diff-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") - #target_compile_definitions(h5diff-shared PRIVATE H5_TOOLS_DEBUG) + #target_compile_definitions (h5diff-shared PRIVATE H5_TOOLS_DEBUG) TARGET_C_PROPERTIES (h5diff-shared SHARED) target_link_libraries (h5diff-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) set_target_properties (h5diff-shared PROPERTIES FOLDER tools) |