diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-25 11:21:06 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-25 11:21:18 (GMT) |
| commit | 9111590acadbfa662053c7878ae95efa46bbfb36 (patch) | |
| tree | 6cddd3aa46a800ebc07572d479027a5121f97eed /Source | |
| parent | c173ed118429a885947907d2e23a9895a60b839a (diff) | |
| parent | 3391a3eca821ec9e2844af60835e6f2ab722ceed (diff) | |
| download | CMake-9111590acadbfa662053c7878ae95efa46bbfb36.zip CMake-9111590acadbfa662053c7878ae95efa46bbfb36.tar.gz CMake-9111590acadbfa662053c7878ae95efa46bbfb36.tar.bz2 | |
Merge topic 'ninja-swift-map-file-path'
3391a3eca8 Ninja: do not normalise swift support file paths
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3597
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index de79817..08c92ff 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -910,8 +910,8 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatements() this->GetBuildFileStream() << "\n"; if (!this->SwiftOutputMap.empty()) { - std::string const mapFilePath = this->ConvertToNinjaPath( - this->GeneratorTarget->GetSupportDirectory() + "/output-file-map.json"); + std::string const mapFilePath = + this->GeneratorTarget->GetSupportDirectory() + "/output-file-map.json"; std::string const targetSwiftDepsPath = [this]() -> std::string { cmGeneratorTarget const* target = this->GeneratorTarget; if (const char* name = target->GetProperty("Swift_DEPENDENCIES_FILE")) { |