diff options
author | kmu <kmu@hdfgroup.org> | 2020-01-19 14:09:44 (GMT) |
---|---|---|
committer | kmu <kmu@hdfgroup.org> | 2020-01-19 14:09:44 (GMT) |
commit | 628d267162895adef5a73e1cd5810030cc98335a (patch) | |
tree | 05471ae798eaef041ea98fecdd285c9380ce381a /test/CMakeLists.txt | |
parent | d46ea2d08af456f1cfaf6c6fd3060f39b92be8de (diff) | |
parent | 7e93acd94f20c73d27bb2eb4f7b4389d88cfb299 (diff) | |
download | hdf5-628d267162895adef5a73e1cd5810030cc98335a.zip hdf5-628d267162895adef5a73e1cd5810030cc98335a.tar.gz hdf5-628d267162895adef5a73e1cd5810030cc98335a.tar.bz2 |
merge and fix conflict
Diffstat (limited to 'test/CMakeLists.txt')
-rw-r--r-- | test/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index c7a945e..77f9191 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -525,4 +525,6 @@ else () endif () set_target_properties (use_disable_mdc_flushes PROPERTIES FOLDER test) -include (CMakeTests.cmake) +if (HDF5_TEST_SERIAL) + include (CMakeTests.cmake) +endif () |