diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-11-08 13:52:45 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-08 13:52:45 (GMT) |
commit | 7077e505dc3f85010fe6529355e597938d09f732 (patch) | |
tree | 4e0804f40ca708ef538c1c0c88c0d3b8038ed981 /config/cmake/scripts/CTestScript.cmake | |
parent | 2061020115ad53f845021957d11f316773bb3cb7 (diff) | |
download | hdf5-7077e505dc3f85010fe6529355e597938d09f732.zip hdf5-7077e505dc3f85010fe6529355e597938d09f732.tar.gz hdf5-7077e505dc3f85010fe6529355e597938d09f732.tar.bz2 |
1.8 Merge #2175 Implement option for using CMake GNUInstallDirs (#2224)
* Merge #2175 Implement option for using CMake GNUInstallDirs
* 1.8 only revert mod dir because of windows
Diffstat (limited to 'config/cmake/scripts/CTestScript.cmake')
-rwxr-xr-x | config/cmake/scripts/CTestScript.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake index b142ade..fa149c3 100755 --- 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 () |