1.10 Merge HDFGroup#2175 Implement option for using CMake GNUInstallDirs (#2222)
This commit is contained in:
@@ -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 ()
|
||||
|
||||
Reference in New Issue
Block a user