diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-04 13:18:07 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-02-04 13:18:12 (GMT) |
| commit | 01b89d2547a04b25c462444dd5aac751f0ec54b0 (patch) | |
| tree | e6ddd12305ee550864909a309aa594066a83a187 /Tests | |
| parent | c8a955584d5edeb426a0176da1847c84c3b99e89 (diff) | |
| parent | cbb87e0a2c467cc9349e0d3180a5d2942fbca4e7 (diff) | |
| download | CMake-01b89d2547a04b25c462444dd5aac751f0ec54b0.zip CMake-01b89d2547a04b25c462444dd5aac751f0ec54b0.tar.gz CMake-01b89d2547a04b25c462444dd5aac751f0ec54b0.tar.bz2 | |
Merge topic 'ep-patch-USES_TERMINAL' into release-3.23
cbb87e0a2c ExternalProject: Add support for USES_TERMINAL_PATCH keyword
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6940
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/ExternalProject/UsesTerminal-check.cmake | 11 | ||||
| -rw-r--r-- | Tests/RunCMake/ExternalProject/UsesTerminal.cmake | 11 |
2 files changed, 13 insertions, 9 deletions
diff --git a/Tests/RunCMake/ExternalProject/UsesTerminal-check.cmake b/Tests/RunCMake/ExternalProject/UsesTerminal-check.cmake index 201d822..2946c0b 100644 --- a/Tests/RunCMake/ExternalProject/UsesTerminal-check.cmake +++ b/Tests/RunCMake/ExternalProject/UsesTerminal-check.cmake @@ -37,10 +37,11 @@ endmacro() # Check Ninja build output to verify whether each target step is in the # console pool. macro(CheckNinjaTarget _target - _download _update _configure _build _test _install + _download _update _patch _configure _build _test _install ) CheckNinjaStep(${_target} download ${_download}) CheckNinjaStep(${_target} update ${_update}) + CheckNinjaStep(${_target} patch ${_patch}) CheckNinjaStep(${_target} configure ${_configure}) CheckNinjaStep(${_target} build ${_build}) CheckNinjaStep(${_target} test ${_test}) @@ -88,10 +89,10 @@ endif() # Actual tests: CheckNinjaTarget(TerminalTest1 - true true true true true true ) + true true true true true true true ) CheckNinjaTarget(TerminalTest2 - true false true false true false) + true false true false true false true) CheckNinjaTarget(TerminalTest3 - false true false true false true ) + false true false true false true false) CheckNinjaTarget(TerminalTest4 - false false false false false false) + false false false false false false false) diff --git a/Tests/RunCMake/ExternalProject/UsesTerminal.cmake b/Tests/RunCMake/ExternalProject/UsesTerminal.cmake index d3494fd..4f10b6c 100644 --- a/Tests/RunCMake/ExternalProject/UsesTerminal.cmake +++ b/Tests/RunCMake/ExternalProject/UsesTerminal.cmake @@ -10,6 +10,7 @@ macro(DoTerminalTest _target) ExternalProject_Add(${_target} DOWNLOAD_COMMAND "${CMAKE_COMMAND}" -E echo "download" UPDATE_COMMAND "${CMAKE_COMMAND}" -E echo "update" + PATCH_COMMAND "${CMAKE_COMMAND}" -E echo "patch" CONFIGURE_COMMAND "${CMAKE_COMMAND}" -E echo "configure" BUILD_COMMAND "${CMAKE_COMMAND}" -E echo "build" TEST_COMMAND "${CMAKE_COMMAND}" -E echo "test" @@ -22,6 +23,7 @@ endmacro() DoTerminalTest(TerminalTest1 USES_TERMINAL_DOWNLOAD 1 USES_TERMINAL_UPDATE 1 + USES_TERMINAL_PATCH 1 USES_TERMINAL_CONFIGURE 1 USES_TERMINAL_BUILD 1 USES_TERMINAL_TEST 1 @@ -31,15 +33,16 @@ DoTerminalTest(TerminalTest1 # USES_TERMINAL on every other step, starting with download DoTerminalTest(TerminalTest2 USES_TERMINAL_DOWNLOAD 1 - USES_TERMINAL_CONFIGURE 1 - USES_TERMINAL_TEST 1 + USES_TERMINAL_PATCH 1 + USES_TERMINAL_BUILD 1 + USES_TERMINAL_INSTALL 1 ) # USES_TERMINAL on every other step, starting with update DoTerminalTest(TerminalTest3 USES_TERMINAL_UPDATE 1 - USES_TERMINAL_BUILD 1 - USES_TERMINAL_INSTALL 1 + USES_TERMINAL_CONFIGURE 1 + USES_TERMINAL_TEST 1 ) # USES_TERMINAL on no step |