From 54a48c6781dd02f2ebbdb19a77c9a4fb59e67735 Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Sat, 25 Feb 2017 21:26:17 +0100 Subject: Xcode: Use proper buildable name for schema --- Source/cmXCodeScheme.cxx | 5 +++-- Source/cmXCodeScheme.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/cmXCodeScheme.cxx b/Source/cmXCodeScheme.cxx index 1596e5c..5c22531 100644 --- a/Source/cmXCodeScheme.cxx +++ b/Source/cmXCodeScheme.cxx @@ -15,6 +15,7 @@ cmXCodeScheme::cmXCodeScheme(cmXCodeObject* xcObj, unsigned int xcVersion) : Target(xcObj) , TargetName(xcObj->GetTarget()->GetName()) + , BuildableName(xcObj->GetTarget()->GetFullName()) , TargetId(xcObj->GetId()) , ConfigList(configList) , XcodeVersion(xcVersion) @@ -87,7 +88,7 @@ void cmXCodeScheme::WriteBuildAction(cmXMLWriter& xout, xout.BreakAttributes(); xout.Attribute("BuildableIdentifier", "primary"); xout.Attribute("BlueprintIdentifier", this->TargetId); - xout.Attribute("BuildableName", this->TargetName); + xout.Attribute("BuildableName", this->BuildableName); xout.Attribute("BlueprintName", this->TargetName); xout.Attribute("ReferencedContainer", "container:" + container); xout.EndElement(); @@ -149,7 +150,7 @@ void cmXCodeScheme::WriteLaunchAction(cmXMLWriter& xout, xout.BreakAttributes(); xout.Attribute("BuildableIdentifier", "primary"); xout.Attribute("BlueprintIdentifier", this->TargetId); - xout.Attribute("BuildableName", this->TargetName); + xout.Attribute("BuildableName", this->BuildableName); xout.Attribute("BlueprintName", this->TargetName); xout.Attribute("ReferencedContainer", "container:" + container); xout.EndElement(); diff --git a/Source/cmXCodeScheme.h b/Source/cmXCodeScheme.h index 470b5fd..0a8e737 100644 --- a/Source/cmXCodeScheme.h +++ b/Source/cmXCodeScheme.h @@ -26,6 +26,7 @@ public: private: const cmXCodeObject* const Target; const std::string& TargetName; + const std::string BuildableName; const std::string& TargetId; const std::vector& ConfigList; const unsigned int XcodeVersion; -- cgit v0.12