diff options
| author | Craig Scott <craig.scott@crascit.com> | 2020-11-28 20:35:04 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-28 20:35:12 (GMT) |
| commit | 7fb0a78ab10e4c2f51f8092796d9c9778e58954f (patch) | |
| tree | 4871c647b4601d703f1f1b42860fad80e417f4fb /Modules | |
| parent | bcf19af5c71c7618aaf8fa6982e52c5e86d31eb1 (diff) | |
| parent | 705e31a31ba3650018f2d4a1bfe08a31a0892cd4 (diff) | |
| download | CMake-7fb0a78ab10e4c2f51f8092796d9c9778e58954f.zip CMake-7fb0a78ab10e4c2f51f8092796d9c9778e58954f.tar.gz CMake-7fb0a78ab10e4c2f51f8092796d9c9778e58954f.tar.bz2 | |
Merge topic 'ctest-less-findy'
705e31a31b CTest: only look for update executables when needed
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5542
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CTest.cmake | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake index a18e85b..8f8ebb4 100644 --- a/Modules/CTest.cmake +++ b/Modules/CTest.cmake @@ -121,15 +121,6 @@ if(BUILD_TESTING) string(APPEND SUBMIT_URL "${DROP_SITE}${DROP_LOCATION}") endif() - find_program(CVSCOMMAND cvs ) - set(CVS_UPDATE_OPTIONS "-d -A -P" CACHE STRING - "Options passed to the cvs update command.") - find_program(SVNCOMMAND svn) - find_program(BZRCOMMAND bzr) - find_program(HGCOMMAND hg) - find_program(GITCOMMAND git) - find_program(P4COMMAND p4) - if(NOT UPDATE_TYPE) if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CVS") set(UPDATE_TYPE cvs) @@ -146,21 +137,29 @@ if(BUILD_TESTING) string(TOLOWER "${UPDATE_TYPE}" _update_type) if("${_update_type}" STREQUAL "cvs") + find_program(CVSCOMMAND cvs ) + set(CVS_UPDATE_OPTIONS "-d -A -P" CACHE STRING + "Options passed to the cvs update command.") set(UPDATE_COMMAND "${CVSCOMMAND}") set(UPDATE_OPTIONS "${CVS_UPDATE_OPTIONS}") elseif("${_update_type}" STREQUAL "svn") + find_program(SVNCOMMAND svn) set(UPDATE_COMMAND "${SVNCOMMAND}") set(UPDATE_OPTIONS "${SVN_UPDATE_OPTIONS}") elseif("${_update_type}" STREQUAL "bzr") + find_program(BZRCOMMAND bzr) set(UPDATE_COMMAND "${BZRCOMMAND}") set(UPDATE_OPTIONS "${BZR_UPDATE_OPTIONS}") elseif("${_update_type}" STREQUAL "hg") + find_program(HGCOMMAND hg) set(UPDATE_COMMAND "${HGCOMMAND}") set(UPDATE_OPTIONS "${HG_UPDATE_OPTIONS}") elseif("${_update_type}" STREQUAL "git") + find_program(GITCOMMAND git) set(UPDATE_COMMAND "${GITCOMMAND}") set(UPDATE_OPTIONS "${GIT_UPDATE_OPTIONS}") elseif("${_update_type}" STREQUAL "p4") + find_program(P4COMMAND p4) set(UPDATE_COMMAND "${P4COMMAND}") set(UPDATE_OPTIONS "${P4_UPDATE_OPTIONS}") endif() |