summaryrefslogtreecommitdiffstats
path: root/config/cmake
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2022-11-04 13:13:08 (GMT)
committerGitHub <noreply@github.com>2022-11-04 13:13:08 (GMT)
commit7a1885451213244da0b244338435830fc4dd6ea1 (patch)
tree49bfaa85dfc0236b43895ed36c7fc284e4f71cf5 /config/cmake
parent66c8a487221e354d5e8e820176e9a08887caa052 (diff)
downloadhdf5-7a1885451213244da0b244338435830fc4dd6ea1.zip
hdf5-7a1885451213244da0b244338435830fc4dd6ea1.tar.gz
hdf5-7a1885451213244da0b244338435830fc4dd6ea1.tar.bz2
Merge #2198 correct CMake MPI linking (#2215)
Diffstat (limited to 'config/cmake')
-rw-r--r--config/cmake/scripts/CTestScript.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index b142ade..fa149c3 100644
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -51,7 +51,7 @@ endif ()
set (BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
# Launchers work only with Makefile and Ninja generators.
-if(NOT "${CTEST_CMAKE_GENERATOR}" MATCHES "Make|Ninja")
+if(NOT "${CTEST_CMAKE_GENERATOR}" MATCHES "Make|Ninja" OR LOCAL_SKIP_TEST)
set(CTEST_USE_LAUNCHERS 0)
set(ENV{CTEST_USE_LAUNCHERS_DEFAULT} 0)
set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=OFF")
@@ -269,7 +269,7 @@ endif ()
## -- LOCAL_MEMCHECK_TEST executes the Valgrind testing
## -- LOCAL_COVERAGE_TEST executes code coverage process
## --------------------------
- ctest_start (${MODEL} TRACK ${MODEL})
+ ctest_start (${MODEL} GROUP ${MODEL})
if (LOCAL_UPDATE)
ctest_update (SOURCE "${CTEST_SOURCE_DIRECTORY}")
endif ()