diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2015-12-03 21:17:37 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2015-12-03 21:17:37 (GMT) |
| commit | f1660b32279ae76101040b349272732ca7307eb2 (patch) | |
| tree | 1f6a72e078bdb996baea9b1c06cdab31ac82ae50 | |
| parent | 6a7920147483a195aef6444b55450edac4e4f9d5 (diff) | |
| download | hdf5-f1660b32279ae76101040b349272732ca7307eb2.zip hdf5-f1660b32279ae76101040b349272732ca7307eb2.tar.gz hdf5-f1660b32279ae76101040b349272732ca7307eb2.tar.bz2 | |
[svn-r28509] Corrected accum test file handling. The reader is static only.(Although it could be built shared - but this could make things more complicated).
| -rw-r--r-- | test/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | test/CMakeTests.cmake | 17 |
2 files changed, 17 insertions, 20 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 04ebae1..100f34f 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -415,26 +415,6 @@ 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) -add_custom_command ( - TARGET accum_swmr_reader - POST_BUILD - COMMAND ${CMAKE_COMMAND} - ARGS -E copy_if_different "${CMAKE_BINARY_DIR}/bin/accum_swmr_reader" "${PROJECT_BINARY_DIR}/H5TEST/accum_swmr_reader" -) -if (BUILD_SHARED_LIBS) - add_executable (accum_swmr_reader-shared ${HDF5_TEST_SOURCE_DIR}/accum_swmr_reader.c) - TARGET_NAMING (accum_swmr_reader-shared SHARED) - TARGET_C_PROPERTIES (accum_swmr_reader-shared SHARED " " " ") - target_link_libraries (accum_swmr_reader-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) - set_target_properties (accum_swmr_reader-shared PROPERTIES FOLDER test) - # NOTE: Revert name to name without "-shared" on copy - add_custom_command ( - TARGET accum_swmr_reader-shared - POST_BUILD - COMMAND ${CMAKE_COMMAND} - ARGS -E copy_if_different "${CMAKE_BINARY_DIR}/bin/accum_swmr_reader-shared" "${PROJECT_BINARY_DIR}/H5TEST-shared/accum_swmr_reader" - ) -endif (BUILD_SHARED_LIBS) #-- Set accum dependencies set_target_properties (accum PROPERTIES DEPENDS accum_swmr_reader) diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index 3920e70..1cd758b 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -43,6 +43,23 @@ set (HDF5_TEST_FILES tnullspace.h5 ) +if (NOT WIN32) + 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) +endif (NOT WIN32) + foreach (h5_tfile ${HDF5_TEST_FILES}) set (dest "${PROJECT_BINARY_DIR}/H5TEST/${h5_tfile}") add_custom_command ( |