summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-09-03 17:59:05 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-09-03 17:59:05 (GMT)
commitb1dab421dec1b7be64ef2c804a7e0e9b68630fc9 (patch)
tree4c3909ac8691ba5dba49ae73e57cf6d1f6e10a59
parenta8af828bbfb59c0778e38702cabb20e1b08a3e84 (diff)
parent781843da4b90d6d22f8a27b6abaad441631ab3d1 (diff)
downloadhdf5-b1dab421dec1b7be64ef2c804a7e0e9b68630fc9.zip
hdf5-b1dab421dec1b7be64ef2c804a7e0e9b68630fc9.tar.gz
hdf5-b1dab421dec1b7be64ef2c804a7e0e9b68630fc9.tar.bz2
Merge pull request #1917 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '781843da4b90d6d22f8a27b6abaad441631ab3d1': Fix CMake build of test needing compression libs
-rw-r--r--test/CMakeLists.txt15
1 files changed, 14 insertions, 1 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c1ac44c..8184d7f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -242,7 +242,7 @@ set (H5_TESTS
page_buffer
dtypes
dsets
- chunk_info
+ chunk_info # compression lib link
cmpd_dset
filter_fail
extend
@@ -302,6 +302,7 @@ macro (ADD_H5_EXE file)
endmacro ()
set (H5_TESTS_MULTIPLE
+ chunk_info
direct_chunk
testhdf5
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 ###
##############################################################################
######### 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
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}>")