diff options
| author | kmu <kmu@hdfgroup.org> | 2020-01-23 03:30:36 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2020-01-23 03:30:36 (GMT) |
| commit | 2de0ce0d8ba2fb58fadefc5d718a3c0fedab25c8 (patch) | |
| tree | 795739e979593ab3b0d0d3b4a6124c1f7049ab50 /hl/tools/h5watch/CMakeLists.txt | |
| parent | 408b9b1f3b8e84ba090c51e665d38eedef32c7ee (diff) | |
| parent | d7414053638316081f11fad78474b2c3cde336c5 (diff) | |
| download | hdf5-2de0ce0d8ba2fb58fadefc5d718a3c0fedab25c8.zip hdf5-2de0ce0d8ba2fb58fadefc5d718a3c0fedab25c8.tar.gz hdf5-2de0ce0d8ba2fb58fadefc5d718a3c0fedab25c8.tar.bz2 | |
merge and fix conflict
Diffstat (limited to 'hl/tools/h5watch/CMakeLists.txt')
| -rw-r--r-- | hl/tools/h5watch/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hl/tools/h5watch/CMakeLists.txt b/hl/tools/h5watch/CMakeLists.txt index b3d65f7..edb78c0 100644 --- a/hl/tools/h5watch/CMakeLists.txt +++ b/hl/tools/h5watch/CMakeLists.txt @@ -26,7 +26,7 @@ if (BUILD_SHARED_LIBS) set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5watch-shared) endif () -if (BUILD_TESTING) +if (BUILD_TESTING AND HDF5_TEST_SWMR AND HDF5_TEST_SERIAL) #-- Add swmr_check_compat_vfd program set (hl_swmr_check_compat_vfd_SOURCES ${HDF5_HL_TOOLS_H5WATCH_SOURCE_DIR}/swmr_check_compat_vfd.c @@ -68,7 +68,9 @@ if (BUILD_TESTING) endif () set_target_properties (h5watchgentest PROPERTIES FOLDER generator/tools/hl) - include (CMakeTests.cmake) + if (HDF5_TEST_TOOLS) + include (CMakeTests.cmake) + endif () endif () #----------------------------------------------------------------------------- |