diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-26 14:29:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-26 14:29:28 (GMT) |
| commit | ef13fc4dfcbb2b7cf79aade2d7612c3748fb24b2 (patch) | |
| tree | f470665dd5c656ce14063971d3ad4f1d1a87132e /Modules | |
| parent | 40df0d653659fe3403bbeb5e3251f8cea72926fd (diff) | |
| parent | 970c82348babacb918802dbf615b2224313eef55 (diff) | |
| download | CMake-ef13fc4dfcbb2b7cf79aade2d7612c3748fb24b2.zip CMake-ef13fc4dfcbb2b7cf79aade2d7612c3748fb24b2.tar.gz CMake-ef13fc4dfcbb2b7cf79aade2d7612c3748fb24b2.tar.bz2 | |
Merge topic 'ctest-p4'
970c823 ctest_update: Add support for Perforce p4 client
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CTest.cmake | 5 | ||||
| -rw-r--r-- | Modules/DartConfiguration.tcl.in | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake index 643cd29..ada8655 100644 --- a/Modules/CTest.cmake +++ b/Modules/CTest.cmake @@ -149,6 +149,7 @@ if(BUILD_TESTING) 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") @@ -180,6 +181,9 @@ if(BUILD_TESTING) elseif("${_update_type}" STREQUAL "git") set(UPDATE_COMMAND "${GITCOMMAND}") set(UPDATE_OPTIONS "${GIT_UPDATE_OPTIONS}") + elseif("${_update_type}" STREQUAL "p4") + set(UPDATE_COMMAND "${P4COMMAND}") + set(UPDATE_OPTIONS "${P4_UPDATE_OPTIONS}") endif() set(DART_TESTING_TIMEOUT 1500 CACHE STRING @@ -275,6 +279,7 @@ if(BUILD_TESTING) CVS_UPDATE_OPTIONS DART_TESTING_TIMEOUT GITCOMMAND + P4COMMAND HGCOMMAND MAKECOMMAND MEMORYCHECK_COMMAND diff --git a/Modules/DartConfiguration.tcl.in b/Modules/DartConfiguration.tcl.in index 9e49ac7..68fadf6 100644 --- a/Modules/DartConfiguration.tcl.in +++ b/Modules/DartConfiguration.tcl.in @@ -52,6 +52,13 @@ GITCommand: @GITCOMMAND@ GITUpdateOptions: @GIT_UPDATE_OPTIONS@ GITUpdateCustom: @CTEST_GIT_UPDATE_CUSTOM@ +# Perforce options +P4Command: @P4COMMAND@ +P4Client: @CTEST_P4_CLIENT@ +P4Options: @CTEST_P4_OPTIONS@ +P4UpdateOptions: @CTEST_P4_UPDATE_OPTIONS@ +P4UpdateCustom: @CTEST_P4_UPDATE_CUSTOM@ + # Generic update command UpdateCommand: @UPDATE_COMMAND@ UpdateOptions: @UPDATE_OPTIONS@ |