diff options
| author | Craig Scott <craig.scott@crascit.com> | 2021-02-18 12:39:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-18 12:39:23 (GMT) |
| commit | cb2dc8207cd685b572b2d7a3e4ddd401a84af5ff (patch) | |
| tree | 6724e73cfdea86934d86044f37e1b9b2e2bf0150 /Tests/RunCMake | |
| parent | b8762f31897e7b8fa5fa85bd20bc97f945098914 (diff) | |
| parent | bd876f3849663959f4b8b7c7f2052ecbb53b8500 (diff) | |
| download | CMake-cb2dc8207cd685b572b2d7a3e4ddd401a84af5ff.zip CMake-cb2dc8207cd685b572b2d7a3e4ddd401a84af5ff.tar.gz CMake-cb2dc8207cd685b572b2d7a3e4ddd401a84af5ff.tar.bz2 | |
Merge topic 'fetchcontent-patch-step-typo'
bd876f3849 FetchContent: Restore patch command support
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5822
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/FetchContent/MultiCommand-stdout.txt | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/FetchContent/MultiCommand.cmake | 18 | ||||
| -rw-r--r-- | Tests/RunCMake/FetchContent/RunCMakeTest.cmake | 1 |
3 files changed, 25 insertions, 0 deletions
diff --git a/Tests/RunCMake/FetchContent/MultiCommand-stdout.txt b/Tests/RunCMake/FetchContent/MultiCommand-stdout.txt new file mode 100644 index 0000000..7f2c0f8 --- /dev/null +++ b/Tests/RunCMake/FetchContent/MultiCommand-stdout.txt @@ -0,0 +1,6 @@ +.* *download 1 +.* *download 2 +.* *update 1 +.* *update 2 +.* *patch 1 +.* *patch 2 diff --git a/Tests/RunCMake/FetchContent/MultiCommand.cmake b/Tests/RunCMake/FetchContent/MultiCommand.cmake new file mode 100644 index 0000000..92e08e4 --- /dev/null +++ b/Tests/RunCMake/FetchContent/MultiCommand.cmake @@ -0,0 +1,18 @@ +include(FetchContent) + +# Verify COMMAND keyword is recognised after various *_COMMAND options +FetchContent_Declare(multiCommand + DOWNLOAD_COMMAND "${CMAKE_COMMAND}" -E echo "download 1" + COMMAND "${CMAKE_COMMAND}" -E echo "download 2" + UPDATE_COMMAND "${CMAKE_COMMAND}" -E echo "update 1" + COMMAND "${CMAKE_COMMAND}" -E echo "update 2" + PATCH_COMMAND "${CMAKE_COMMAND}" -E echo "patch 1" + COMMAND "${CMAKE_COMMAND}" -E echo "patch 2" +) + +# Force all steps to be re-run by removing timestamps, scripts, etc. from any +# previous run +file(REMOVE_RECURSE "${FETCHCONTENT_BASE_DIR}/multiCommand-subbuild") + +set(FETCHCONTENT_QUIET FALSE) +FetchContent_MakeAvailable(multiCommand) diff --git a/Tests/RunCMake/FetchContent/RunCMakeTest.cmake b/Tests/RunCMake/FetchContent/RunCMakeTest.cmake index b497382..13013fa 100644 --- a/Tests/RunCMake/FetchContent/RunCMakeTest.cmake +++ b/Tests/RunCMake/FetchContent/RunCMakeTest.cmake @@ -2,6 +2,7 @@ include(RunCMake) unset(RunCMake_TEST_NO_CLEAN) +run_cmake(MultiCommand) run_cmake(MissingDetails) run_cmake(DirectIgnoresDetails) run_cmake(FirstDetailsWin) |