mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-01 04:08:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmGeneratorTarget::GetProperty: return cmProp

Browse Source
This commit is contained in:
Vitaly Stakhovsky
2020-04-29 11:00:00 -04:00
parent d63c442a6b
commit 36aba01223
32 changed files with 644 additions and 649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmNinjaNormalTargetGenerator.cxx
View File

@@ -847,8 +847,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
}();
vars["SWIFT_MODULE_NAME"] = [gt]() -> std::string {
if (const char* name = gt->GetProperty("Swift_MODULE_NAME")) {
return name;
if (cmProp name = gt->GetProperty("Swift_MODULE_NAME")) {
return *name;
}
return gt->GetName();
}();
@@ -856,15 +856,15 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
vars["SWIFT_MODULE"] = [this](const std::string& module) -> std::string {
std::string directory =
this->GetLocalGenerator()->GetCurrentBinaryDirectory();
if (const char* prop = this->GetGeneratorTarget()->GetProperty(
if (cmProp prop = this->GetGeneratorTarget()->GetProperty(
"Swift_MODULE_DIRECTORY")) {
directory = prop;
directory = *prop;
}
std::string name = module + ".swiftmodule";
if (const char* prop =
if (cmProp prop =
this->GetGeneratorTarget()->GetProperty("Swift_MODULE")) {
name = prop;
name = *prop;
}
return this->GetLocalGenerator()->ConvertToOutputFormat(