diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-26 13:23:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-26 13:23:19 (GMT) |
| commit | 40b806ee967e9931365d6d1f3946126be22fb4be (patch) | |
| tree | 3a41d80f7da539dc6380f89a3cab071839d0bed8 /Source | |
| parent | 61fd90b90c9dfec154aee7fb4d97574921e651d1 (diff) | |
| parent | 3b864b2583d977898638336f5a096ff33955bd7a (diff) | |
| download | CMake-40b806ee967e9931365d6d1f3946126be22fb4be.zip CMake-40b806ee967e9931365d6d1f3946126be22fb4be.tar.gz CMake-40b806ee967e9931365d6d1f3946126be22fb4be.tar.bz2 | |
Merge topic 'ninja-multi-long-custom-command'
3b864b2583 Ninja Multi-Config: Include configs in long CC scripts
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5941
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 981c9cf..f2575c9 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -654,6 +654,12 @@ void cmLocalNinjaGenerator::WriteCustomCommandBuildStatement( gg->WriteBuild(this->GetImplFileStream(fileConfig), build); } else { std::string customStep = cmSystemTools::GetFilenameName(ninjaOutputs[0]); + if (this->GlobalGenerator->IsMultiConfig()) { + customStep += '-'; + customStep += fileConfig; + customStep += '-'; + customStep += ccg.GetOutputConfig(); + } // Hash full path to make unique. customStep += '-'; cmCryptoHash hash(cmCryptoHash::AlgoSHA256); |