diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-03 12:29:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-03 12:30:01 (GMT) |
| commit | 7cef3fad024b4ecbb0b5e7fc16d770d31d59ed47 (patch) | |
| tree | b383abdb73727cb24f484f0feab620a8b8293314 /Tests/RunCMake | |
| parent | 23d379674b3f85b6895e07cbbe81b6e3325d6706 (diff) | |
| parent | e0a7c0d40d7cec467e9247ce02e89638224c20e0 (diff) | |
| download | CMake-7cef3fad024b4ecbb0b5e7fc16d770d31d59ed47.zip CMake-7cef3fad024b4ecbb0b5e7fc16d770d31d59ed47.tar.gz CMake-7cef3fad024b4ecbb0b5e7fc16d770d31d59ed47.tar.bz2 | |
Merge topic 'nmc-test-fix'
e0a7c0d40d Tests: Fix one RunCMake.NinjaMultiConfig case name
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5447
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/NinjaMultiConfig/CustomCommandGenerator-debug-clean-again-ninja-check.cmake (renamed from Tests/RunCMake/NinjaMultiConfig/CustomCommandGenerator-debug-in-release-graph-clean-ninja-check.cmake) | 0 | ||||
| -rw-r--r-- | Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/NinjaMultiConfig/CustomCommandGenerator-debug-in-release-graph-clean-ninja-check.cmake b/Tests/RunCMake/NinjaMultiConfig/CustomCommandGenerator-debug-clean-again-ninja-check.cmake index 1e4cbe1..1e4cbe1 100644 --- a/Tests/RunCMake/NinjaMultiConfig/CustomCommandGenerator-debug-in-release-graph-clean-ninja-check.cmake +++ b/Tests/RunCMake/NinjaMultiConfig/CustomCommandGenerator-debug-clean-again-ninja-check.cmake diff --git a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake index 6699a09..2411114 100644 --- a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake +++ b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake @@ -215,7 +215,7 @@ run_ninja(CustomCommandGenerator debug-clean build-Debug.ninja clean) run_cmake_build(CustomCommandGenerator release-clean Release clean) run_cmake_build(CustomCommandGenerator debug-in-release-graph Release generated:Debug) run_cmake_command(CustomCommandGenerator-debug-in-release-graph-generated "${TARGET_FILE_generated_Debug}") -run_ninja(CustomCommandGenerator debug-in-release-graph-clean build-Debug.ninja clean:Debug) +run_ninja(CustomCommandGenerator debug-clean-again build-Debug.ninja clean:Debug) run_ninja(CustomCommandGenerator release-in-debug-graph build-Debug.ninja generated:Release) run_cmake_command(CustomCommandGenerator-release-in-debug-graph-generated "${TARGET_FILE_generated_Release}") unset(RunCMake_TEST_NO_CLEAN) |