Merge pull request #1917 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit '781843da4b90d6d22f8a27b6abaad441631ab3d1':
  Fix CMake build of test needing compression libs
This commit is contained in:
Allen Byrne 2019-09-03 12:59:05 -05:00
commit b1dab421de

View File

@ -242,7 +242,7 @@ set (H5_TESTS
page_buffer page_buffer
dtypes dtypes
dsets dsets
chunk_info chunk_info # compression lib link
cmpd_dset cmpd_dset
filter_fail filter_fail
extend extend
@ -302,6 +302,7 @@ macro (ADD_H5_EXE file)
endmacro () endmacro ()
set (H5_TESTS_MULTIPLE set (H5_TESTS_MULTIPLE
chunk_info
direct_chunk direct_chunk
testhdf5 testhdf5
cache_image cache_image
@ -318,6 +319,18 @@ endforeach ()
### M U L T I P L E S O U R C E T E S T S ### ### M U L T I P L E S O U R C E T E S T S ###
############################################################################## ##############################################################################
######### Also special handling of link libs ############# ######### Also special handling of link libs #############
#-- Adding test for chunk_info
add_executable (chunk_info ${HDF5_TEST_SOURCE_DIR}/chunk_info.c)
target_include_directories (chunk_info PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};${HDF5_TEST_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
if (NOT BUILD_SHARED_LIBS)
TARGET_C_PROPERTIES (chunk_info STATIC)
target_link_libraries (chunk_info PRIVATE ${HDF5_TEST_LIB_TARGET} ${LINK_COMP_LIBS})
else ()
TARGET_C_PROPERTIES (chunk_info SHARED)
target_link_libraries (chunk_info PRIVATE ${HDF5_TEST_LIBSH_TARGET} ${LINK_COMP_LIBS})
endif ()
set_target_properties (chunk_info PROPERTIES FOLDER test)
#-- Adding test for direct_chunk #-- Adding test for direct_chunk
add_executable (direct_chunk ${HDF5_TEST_SOURCE_DIR}/direct_chunk.c) add_executable (direct_chunk ${HDF5_TEST_SOURCE_DIR}/direct_chunk.c)
target_include_directories (direct_chunk PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};${HDF5_TEST_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") target_include_directories (direct_chunk PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};${HDF5_TEST_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")