diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2020-01-15 18:28:53 (GMT) |
---|---|---|
committer | David Young <dyoung@hdfgroup.org> | 2020-05-20 14:20:26 (GMT) |
commit | 6b106b2cab0f5d328d6577aa481f762c437815d6 (patch) | |
tree | 895c3cbcbae4d4e256830066d222a54ce1cdbef3 /hl | |
parent | 234492f9e78a3c337dd2099ffa2f183580880808 (diff) | |
download | hdf5-6b106b2cab0f5d328d6577aa481f762c437815d6.zip hdf5-6b106b2cab0f5d328d6577aa481f762c437815d6.tar.gz hdf5-6b106b2cab0f5d328d6577aa481f762c437815d6.tar.bz2 |
HDFFV-11001 need to qualify all by parallel or serial types
Diffstat (limited to 'hl')
-rw-r--r-- | hl/c++/CMakeLists.txt | 5 | ||||
-rw-r--r-- | hl/c++/examples/CMakeLists.txt | 2 | ||||
-rw-r--r-- | hl/c++/test/CMakeLists.txt | 2 | ||||
-rw-r--r-- | hl/examples/CMakeLists.txt | 2 | ||||
-rw-r--r-- | hl/fortran/examples/CMakeLists.txt | 2 | ||||
-rw-r--r-- | hl/fortran/test/CMakeLists.txt | 2 | ||||
-rw-r--r-- | hl/tools/h5watch/CMakeLists.txt | 2 |
7 files changed, 8 insertions, 9 deletions
diff --git a/hl/c++/CMakeLists.txt b/hl/c++/CMakeLists.txt index aa57b76..a62d9d4 100644 --- a/hl/c++/CMakeLists.txt +++ b/hl/c++/CMakeLists.txt @@ -17,7 +17,6 @@ endif () # Add in the unit tests for the packet table c++ wrapper # -------------------------------------------------------------------- -if (BUILD_TESTING AND HDF5_TEST_SERIAL) - add_subdirectory (test) - endif () +if (BUILD_TESTING) + add_subdirectory (test) endif () diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt index a201dea..4bd4807 100644 --- a/hl/c++/examples/CMakeLists.txt +++ b/hl/c++/examples/CMakeLists.txt @@ -23,6 +23,6 @@ else () endif () set_target_properties (ptExampleFL PROPERTIES FOLDER examples/hl/cpp) -if (BUILD_TESTING AND HDF5_TEST_CPP AND HDF5_TEST_EXAMPLES) +if (BUILD_TESTING AND HDF5_TEST_CPP AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL) include (CMakeTests.cmake) endif () diff --git a/hl/c++/test/CMakeLists.txt b/hl/c++/test/CMakeLists.txt index 03237af..429e5c7 100644 --- a/hl/c++/test/CMakeLists.txt +++ b/hl/c++/test/CMakeLists.txt @@ -24,6 +24,6 @@ else () endif () set_target_properties (hl_ptableTest PROPERTIES FOLDER test/hl/cpp) -if (HDF5_TEST_CPP) +if (HDF5_TEST_CPP AND HDF5_TEST_SERIAL) include (CMakeTests.cmake) endif () diff --git a/hl/examples/CMakeLists.txt b/hl/examples/CMakeLists.txt index 0f4ad50..44115e5 100644 --- a/hl/examples/CMakeLists.txt +++ b/hl/examples/CMakeLists.txt @@ -39,6 +39,6 @@ foreach (example ${examples}) set_target_properties (hl_ex_${example} PROPERTIES FOLDER examples/hl) endforeach () -if (BUILD_TESTING AND HDF5_TEST_EXAMPLES) +if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL) include (CMakeTests.cmake) endif () diff --git a/hl/fortran/examples/CMakeLists.txt b/hl/fortran/examples/CMakeLists.txt index 9961f35..449194e 100644 --- a/hl/fortran/examples/CMakeLists.txt +++ b/hl/fortran/examples/CMakeLists.txt @@ -52,6 +52,6 @@ foreach (example ${examples}) endif () endforeach () -if (BUILD_TESTING AND HDF5_TEST_FORTRAN AND HDF5_TEST_EXAMPLES) +if (BUILD_TESTING AND HDF5_TEST_FORTRAN AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL) include (CMakeTests.cmake) endif () diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt index 0c959bb..369692d 100644 --- a/hl/fortran/test/CMakeLists.txt +++ b/hl/fortran/test/CMakeLists.txt @@ -61,6 +61,6 @@ foreach (h5_test ${H5_TESTS}) ADD_H5_FORTRAN_EXE(${h5_test}) endforeach () -if (HDF5_TEST_FORTRAN) +if (HDF5_TEST_FORTRAN AND HDF5_TEST_SERIAL) include (CMakeTests.cmake) endif () diff --git a/hl/tools/h5watch/CMakeLists.txt b/hl/tools/h5watch/CMakeLists.txt index 0ea0af4..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 AND HDF5_TEST_SWMR) +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 |