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 /hl/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 'hl/CMakeLists.txt')
| -rw-r--r-- | hl/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hl/CMakeLists.txt b/hl/CMakeLists.txt index 2a71b47..bef034c 100644 --- a/hl/CMakeLists.txt +++ b/hl/CMakeLists.txt @@ -19,7 +19,7 @@ endif () #-- Build the Unit testing if requested if (NOT HDF5_EXTERNALLY_CONFIGURED) - if (BUILD_TESTING) + if (BUILD_TESTING AND HDF5_TEST_SERIAL) add_subdirectory (test) endif () endif () |