From 104253575dcc7e78c9a52e039028a90a2027896a Mon Sep 17 00:00:00 2001
From: Quincey Koziol <koziol@hdfgroup.org>
Date: Sun, 18 Dec 2016 00:58:46 -0800
Subject: Update CMake configuration files with SWMR accumulator changes.

---
 test/CMakeLists.txt   | 18 +++++++++++++++---
 test/CMakeTests.cmake | 16 ++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5a55616..0197524 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -196,7 +196,6 @@ MACRO (ADD_H5_EXE file)
 ENDMACRO (ADD_H5_EXE file)
 
 set (H5_TESTS
-    #testhdf5
     cache
     cache_api
     cache_tagging
@@ -211,7 +210,6 @@ set (H5_TESTS
     fheap
     pool
     accum
-    #hyperslab
     istore
     bittests
     dt_arith
@@ -234,7 +232,6 @@ set (H5_TESTS
     app_ref
     enum
     set_extent
-    #ttsafe
     enc_dec_plist
     enc_dec_plist_cross_platform
     getname
@@ -328,6 +325,21 @@ foreach (test ${H5_CHECK_TESTS})
   ADD_H5_EXE(${test})
 endforeach (test ${H5_CHECK_TESTS})
 
+#-- Adding test for accum_swmr_reader
+#   This has to be copied to the test directory for execve() to find it
+#   and it can't be renamed (i.e., no <foo>-shared).
+add_executable (accum_swmr_reader ${HDF5_TEST_SOURCE_DIR}/accum_swmr_reader.c)
+TARGET_NAMING (accum_swmr_reader STATIC)
+TARGET_C_PROPERTIES (accum_swmr_reader STATIC " " " ")
+target_link_libraries (accum_swmr_reader ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+set_target_properties (accum_swmr_reader PROPERTIES FOLDER test)
+
+#-- Set accum dependencies
+set_target_properties (accum PROPERTIES DEPENDS accum_swmr_reader)
+if (BUILD_SHARED_LIBS)
+  set_target_properties (accum-shared PROPERTIES DEPENDS accum_swmr_reader)
+endif (BUILD_SHARED_LIBS)
+
 #-- Adding test for libinfo
 set (GREP_RUNNER ${PROJECT_BINARY_DIR}/GrepRunner.cmake)
 file (WRITE ${GREP_RUNNER}
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index 3fc0fb6..99950e3 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -43,6 +43,21 @@ set (HDF5_TEST_FILES
   tnullspace.h5
 )
 
+add_custom_command (
+    TARGET     accum_swmr_reader
+    POST_BUILD
+    COMMAND    ${CMAKE_COMMAND}
+    ARGS       -E copy_if_different "$<TARGET_FILE:accum_swmr_reader>" "${PROJECT_BINARY_DIR}/H5TEST/accum_swmr_reader"
+)
+if (BUILD_SHARED_LIBS)
+  add_custom_command (
+      TARGET     accum_swmr_reader
+      POST_BUILD
+      COMMAND    ${CMAKE_COMMAND}
+      ARGS       -E copy_if_different "$<TARGET_FILE:accum_swmr_reader>" "${PROJECT_BINARY_DIR}/H5TEST-shared/accum_swmr_reader"
+  )
+endif (BUILD_SHARED_LIBS)
+
 foreach (h5_tfile ${HDF5_TEST_FILES})
   HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}" "${PROJECT_BINARY_DIR}/H5TEST/${h5_tfile}" "HDF5_TEST_LIB_files")
   if (BUILD_SHARED_LIBS)
@@ -493,6 +508,7 @@ set (test_CLEANFILES
     vds_src_0.h5
     vds_src_1.h5
     tbogus.h5.copy
+    accum_swmr_big.h5
     cache_logging.h5
     cache_logging.out
 )
-- 
cgit v0.12