diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-24 14:40:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-24 14:41:03 (GMT) |
| commit | cf21ea2ce6b174a69316a39e83616c056fc530e2 (patch) | |
| tree | 242be131760e3fe40adf602eeecd3a20d5efb430 /Tests/RunCMake/Ninja | |
| parent | 6714074cd4754e8d9734174cf47ceb10180f934e (diff) | |
| parent | d33c2c93d8d006f1270c800d5f6a0b3c493e4404 (diff) | |
| download | CMake-cf21ea2ce6b174a69316a39e83616c056fc530e2.zip CMake-cf21ea2ce6b174a69316a39e83616c056fc530e2.tar.gz CMake-cf21ea2ce6b174a69316a39e83616c056fc530e2.tar.bz2 | |
Merge topic 'ninja-status-stderr' into release-3.20
d33c2c93d8 Tests: Update for upstream ninja change to write status on stderr
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5850
Diffstat (limited to 'Tests/RunCMake/Ninja')
| -rw-r--r-- | Tests/RunCMake/Ninja/RunCMakeTest.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Tests/RunCMake/Ninja/RunCMakeTest.cmake b/Tests/RunCMake/Ninja/RunCMakeTest.cmake index b91ab00..1b252cd 100644 --- a/Tests/RunCMake/Ninja/RunCMakeTest.cmake +++ b/Tests/RunCMake/Ninja/RunCMakeTest.cmake @@ -34,6 +34,7 @@ function(run_NoWorkToDo) run_cmake(NoWorkToDo) set(RunCMake_TEST_NO_CLEAN 1) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/NoWorkToDo-build) + set(RunCMake_TEST_OUTPUT_MERGE 1) run_cmake_command(NoWorkToDo-build ${CMAKE_COMMAND} --build .) run_cmake_command(NoWorkToDo-nowork ${CMAKE_COMMAND} --build . -- -d explain) endfunction() @@ -43,6 +44,7 @@ function(run_VerboseBuild) run_cmake(VerboseBuild) set(RunCMake_TEST_NO_CLEAN 1) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/VerboseBuild-build) + set(RunCMake_TEST_OUTPUT_MERGE 1) run_cmake_command(VerboseBuild-build ${CMAKE_COMMAND} --build . -v --clean-first) run_cmake_command(VerboseBuild-nowork ${CMAKE_COMMAND} --build . --verbose) endfunction() |