diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-03-09 13:12:54 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-03-09 13:12:54 (GMT) |
| commit | 87819db28d28a95b2894054b38bda17c546bc572 (patch) | |
| tree | 250677af2e3c6f3df3ab2cf78e58e5d4925031f4 /Source | |
| parent | 51238ec1d927d060d62f65b866eb852c61723173 (diff) | |
| parent | 65b3848de0ae6251858dd12c97bff8110cb845f1 (diff) | |
| download | CMake-87819db28d28a95b2894054b38bda17c546bc572.zip CMake-87819db28d28a95b2894054b38bda17c546bc572.tar.gz CMake-87819db28d28a95b2894054b38bda17c546bc572.tar.bz2 | |
Merge branch 'backport-swift-ninja-multiconfig' into swift-ninja-multiconfig
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index ece958c..062c46c 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -885,11 +885,11 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement( cmOutputConverter::SHELL); }(vars["SWIFT_MODULE_NAME"]); + const std::string map = cmStrCat(gt->GetSupportDirectory(), '/', config, + '/', "output-file-map.json"); vars["SWIFT_OUTPUT_FILE_MAP"] = this->GetLocalGenerator()->ConvertToOutputFormat( - this->ConvertToNinjaPath(gt->GetSupportDirectory() + - "/output-file-map.json"), - cmOutputConverter::SHELL); + this->ConvertToNinjaPath(map), cmOutputConverter::SHELL); vars["SWIFT_SOURCES"] = [this, config]() -> std::string { std::vector<cmSourceFile const*> sources; diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 3803621..0e1136f 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -952,8 +952,9 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatements( this->GetImplFileStream(fileConfig) << "\n"; if (!this->Configs[config].SwiftOutputMap.empty()) { - std::string const mapFilePath = cmStrCat( - this->GeneratorTarget->GetSupportDirectory(), "/output-file-map.json"); + std::string const mapFilePath = + cmStrCat(this->GeneratorTarget->GetSupportDirectory(), '/', config, '/', + "output-file-map.json"); std::string const targetSwiftDepsPath = [this, config]() -> std::string { cmGeneratorTarget const* target = this->GeneratorTarget; if (const char* name = target->GetProperty("Swift_DEPENDENCIES_FILE")) { |