diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-03-09 09:12:54 -0400 |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-03-09 09:12:54 -0400 |
| commit | 87819db28d28a95b2894054b38bda17c546bc572 (patch) | |
| tree | 250677af2e3c6f3df3ab2cf78e58e5d4925031f4 /Source/cmNinjaNormalTargetGenerator.cxx | |
| parent | 51238ec1d927d060d62f65b866eb852c61723173 (diff) | |
| parent | 65b3848de0ae6251858dd12c97bff8110cb845f1 (diff) | |
| download | cmake-87819db28d28a95b2894054b38bda17c546bc572.tar.gz | |
Merge branch 'backport-swift-ninja-multiconfig' into swift-ninja-multiconfig
Diffstat (limited to 'Source/cmNinjaNormalTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index ece958c2d1..062c46c4fc 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; |