diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-02 13:21:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-12-02 13:21:12 (GMT) |
| commit | bdfa5ac7f6cfc961665064f1b7a1395cfd0b2281 (patch) | |
| tree | 9f9c8f4ef0db863fb6adc0ae70891477d66d1cdb /Tests/RunCMake/NinjaMultiConfig | |
| parent | f7ff0d34f0750387f5c56483ab6ba3fb4825b62d (diff) | |
| parent | 628d7ef67258f67e0b4086905011d90727d8b9a1 (diff) | |
| download | CMake-bdfa5ac7f6cfc961665064f1b7a1395cfd0b2281.zip CMake-bdfa5ac7f6cfc961665064f1b7a1395cfd0b2281.tar.gz CMake-bdfa5ac7f6cfc961665064f1b7a1395cfd0b2281.tar.bz2 | |
Merge branch 'master' into llvm-rc-preprocess-as-c
Diffstat (limited to 'Tests/RunCMake/NinjaMultiConfig')
| -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) |