[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-310-g447886f
Stephen Kelly
steveire at gmail.com
Sat Oct 10 05:25:05 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 447886f9173e168eaacd9aacc01c8fc82a763cb3 (commit)
via 8f6f6504dbffbc40785fd98f5668789d558fea77 (commit)
via c66084f5d7df57c991d0f498de04a5f00ae0fcc1 (commit)
via 83c29e3903f947f9d4b5ed79a535f850b3b946e2 (commit)
via 1988255448d7e0f92f4d2f12cc8fc17b1429c328 (commit)
via c1f687b1ad2fe3ed7a8a2d300f1e12df59161cbc (commit)
via a6e1f05c154d123b01bfe75c13d3e016c9074f72 (commit)
via 654002feb88a9a219e2d6b6011c7dccc791627b1 (commit)
via 922c89014f372ca38303b4258345c23027046616 (commit)
via eaa5b9cbb1b145b76eb0448df1ce3a3c63ee13c6 (commit)
via f539da126b55933fae6f40feea35e820cb632877 (commit)
via 1c5d70f9c2b9b7e2aeaf1515ef72a6e9282ecde0 (commit)
via 064c2488119269e88422ea444f87bdd44c4f6589 (commit)
from 172270644be5784f54a4c83785ec2000d0855710 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=447886f9173e168eaacd9aacc01c8fc82a763cb3
commit 447886f9173e168eaacd9aacc01c8fc82a763cb3
Merge: 1722706 8f6f650
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 05:25:03 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 05:25:03 2015 -0400
Merge topic 'use-generator-target' into next
8f6f6504 cmGeneratorTarget: Port ExpandLinkItems away from cmTarget.
c66084f5 cmGeneratorTarget: Port GetImportLinkInterface away from cmTarget.
83c29e39 cmGeneratorTarget: Port ComputeLinkImplementationLibraries away from cmTarget.
19882554 cmGeneratorTarget: Port handleSystemIncludesDep away from cmTarget.
c1f687b1 cmGeneratorTarget: Port GetLinkImplementationLibrariesInternal.
a6e1f05c cmGeneratorTarget: Port ComputeLinkInterface away from cmTarget.
654002fe cmGeneratorTarget: Port ComputeLinkInterfaceLibraries away from cmTarget.
922c8901 cmGeneratorTarget: Port GetLinkInterface away from cmTarget.
eaa5b9cb cmGeneratorTarget: Port cmTargetCollectLinkLanguages away from cmTarget.
f539da12 cmGeneratorTarget: Port GetLinkInterfaceLibraries away from cmTarget.
1c5d70f9 cmGeneratorTarget: Port processILibs away from cmTarget.
064c2488 cmComputeLinkDepends: Port some API to cmGeneratorTarget.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f6f6504dbffbc40785fd98f5668789d558fea77
commit 8f6f6504dbffbc40785fd98f5668789d558fea77
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 05:07:31 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:22:58 2015 +0200
cmGeneratorTarget: Port ExpandLinkItems away from cmTarget.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 26119c3..f39a67d 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4418,7 +4418,7 @@ void cmGeneratorTarget::LookupLinkItems(std::vector<std::string> const& names,
void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
std::string const& value,
std::string const& config,
- cmTarget const* headTarget,
+ cmGeneratorTarget const* headTarget,
bool usage_requirements_only,
std::vector<cmLinkItem>& items,
bool& hadHeadSensitiveCondition) const
@@ -4437,7 +4437,7 @@ void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
this->Makefile,
config,
false,
- headTarget,
+ headTarget->Target,
this->Target, &dagChecker), libs);
this->LookupLinkItems(libs, items);
hadHeadSensitiveCondition = cge->GetHadHeadSensitiveCondition();
@@ -4977,7 +4977,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
// The interface libraries have been explicitly set.
this->ExpandLinkItems(linkIfaceProp, explicitLibraries,
config,
- headTarget->Target, usage_requirements_only,
+ headTarget, usage_requirements_only,
iface.Libraries,
iface.HadHeadSensitiveCondition);
}
@@ -5004,7 +5004,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
{
bool hadHeadSensitiveConditionDummy = false;
this->ExpandLinkItems(newProp, newExplicitLibraries, config,
- headTarget->Target,
+ headTarget,
usage_requirements_only,
ifaceLibs, hadHeadSensitiveConditionDummy);
}
@@ -5070,7 +5070,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
cmSystemTools::ExpandListArgument(info->Languages, iface.Languages);
this->ExpandLinkItems(info->LibrariesProp, info->Libraries,
config,
- headTarget->Target, usage_requirements_only,
+ headTarget, usage_requirements_only,
iface.Libraries,
iface.HadHeadSensitiveCondition);
std::vector<std::string> deps;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 03548e2..799110c 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -507,7 +507,8 @@ private:
mutable std::set<std::string> LinkImplicitNullProperties;
void ExpandLinkItems(std::string const& prop, std::string const& value,
- std::string const& config, cmTarget const* headTarget,
+ std::string const& config,
+ const cmGeneratorTarget* headTarget,
bool usage_requirements_only,
std::vector<cmLinkItem>& items,
bool& hadHeadSensitiveCondition) const;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c66084f5d7df57c991d0f498de04a5f00ae0fcc1
commit c66084f5d7df57c991d0f498de04a5f00ae0fcc1
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 05:07:06 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:22:41 2015 +0200
cmGeneratorTarget: Port GetImportLinkInterface away from cmTarget.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 8a550bf..26119c3 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4451,7 +4451,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
// Imported targets have their own link interface.
if(this->IsImported())
{
- return this->GetImportLinkInterface(config, head->Target, false);
+ return this->GetImportLinkInterface(config, head, false);
}
// Link interfaces are not supported for executables that do not
@@ -4599,7 +4599,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
// Imported targets have their own link interface.
if(this->IsImported())
{
- return this->GetImportLinkInterface(config, head->Target,
+ return this->GetImportLinkInterface(config, head,
usage_requirements_only);
}
@@ -5040,7 +5040,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
//----------------------------------------------------------------------------
const cmLinkInterface *
cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
- cmTarget const* headTarget,
+ cmGeneratorTarget const* headTarget,
bool usage_requirements_only) const
{
cmTarget::ImportInfo const* info = this->Target->GetImportInfo(config);
@@ -5062,7 +5062,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
return &hm.begin()->second;
}
- cmOptionalLinkInterface& iface = hm[headTarget];
+ cmOptionalLinkInterface& iface = hm[headTarget->Target];
if(!iface.AllDone)
{
iface.AllDone = true;
@@ -5070,7 +5070,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
cmSystemTools::ExpandListArgument(info->Languages, iface.Languages);
this->ExpandLinkItems(info->LibrariesProp, info->Libraries,
config,
- headTarget, usage_requirements_only,
+ headTarget->Target, usage_requirements_only,
iface.Libraries,
iface.HadHeadSensitiveCondition);
std::vector<std::string> deps;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 15b1b80..03548e2 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -491,7 +491,8 @@ private:
std::string const& config) const;
cmLinkInterface const*
- GetImportLinkInterface(const std::string& config, cmTarget const* head,
+ GetImportLinkInterface(const std::string& config,
+ const cmGeneratorTarget* head,
bool usage_requirements_only) const;
typedef std::map<std::string, std::vector<cmSourceFile*> >
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83c29e3903f947f9d4b5ed79a535f850b3b946e2
commit 83c29e3903f947f9d4b5ed79a535f850b3b946e2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 05:04:51 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:22:27 2015 +0200
cmGeneratorTarget: Port ComputeLinkImplementationLibraries away from cmTarget.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index b20921f..8a550bf 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5111,7 +5111,7 @@ cmGeneratorTarget::GetLinkImplementation(const std::string& config) const
if(!impl.LibrariesDone)
{
impl.LibrariesDone = true;
- this->ComputeLinkImplementationLibraries(config, impl, this->Target);
+ this->ComputeLinkImplementationLibraries(config, impl, this);
}
if(!impl.LanguagesDone)
{
@@ -5293,7 +5293,7 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal(
if(!impl.LibrariesDone)
{
impl.LibrariesDone = true;
- this->ComputeLinkImplementationLibraries(config, impl, head->Target);
+ this->ComputeLinkImplementationLibraries(config, impl, head);
}
return &impl;
}
@@ -5310,7 +5310,7 @@ cmGeneratorTarget::IsNullImpliedByLinkLibraries(const std::string &p) const
void cmGeneratorTarget::ComputeLinkImplementationLibraries(
const std::string& config,
cmOptionalLinkImplementation& impl,
- cmTarget const* head) const
+ cmGeneratorTarget const* head) const
{
cmStringRange entryRange =
this->Target->GetLinkImplementationEntries();
@@ -5329,7 +5329,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
cmsys::auto_ptr<cmCompiledGeneratorExpression> const cge =
ge.Parse(*le);
std::string const evaluated =
- cge->Evaluate(this->Makefile, config, false, head, &dagChecker);
+ cge->Evaluate(this->Makefile, config, false, head->Target, &dagChecker);
cmSystemTools::ExpandListArgument(evaluated, llibs);
if(cge->GetHadHeadSensitiveCondition())
{
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 7588a59..15b1b80 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -212,7 +212,7 @@ public:
void ComputeLinkImplementationLibraries(const std::string& config,
cmOptionalLinkImplementation& impl,
- cmTarget const* head) const;
+ const cmGeneratorTarget* head) const;
// Compute the set of languages compiled by the target. This is
// computed every time it is called because the languages can change
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1988255448d7e0f92f4d2f12cc8fc17b1429c328
commit 1988255448d7e0f92f4d2f12cc8fc17b1429c328
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 05:03:14 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:22:27 2015 +0200
cmGeneratorTarget: Port handleSystemIncludesDep away from cmTarget.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 5734edf..b20921f 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -511,7 +511,7 @@ cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const
static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
const std::string& config,
- cmTarget *headTarget,
+ cmGeneratorTarget const* headTarget,
cmGeneratorExpressionDAGChecker *dagChecker,
std::vector<std::string>& result,
bool excludeImported)
@@ -522,7 +522,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
cmGeneratorExpression ge;
cmSystemTools::ExpandListArgument(ge.Parse(dirs)
->Evaluate(mf,
- config, false, headTarget,
+ config, false, headTarget->Target,
depTgt, dagChecker), result);
}
if (!depTgt->IsImported() || excludeImported)
@@ -536,7 +536,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
cmGeneratorExpression ge;
cmSystemTools::ExpandListArgument(ge.Parse(dirs)
->Evaluate(mf,
- config, false, headTarget,
+ config, false, headTarget->Target,
depTgt, dagChecker), result);
}
}
@@ -869,7 +869,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
for(std::vector<cmTarget const*>::const_iterator
li = deps.begin(), le = deps.end(); li != le; ++li)
{
- handleSystemIncludesDep(this->Makefile, *li, config, this->Target,
+ handleSystemIncludesDep(this->Makefile, *li, config, this,
&dagChecker, result, excludeImported);
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1f687b1ad2fe3ed7a8a2d300f1e12df59161cbc
commit c1f687b1ad2fe3ed7a8a2d300f1e12df59161cbc
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 04:56:37 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:22:20 2015 +0200
cmGeneratorTarget: Port GetLinkImplementationLibrariesInternal.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index e7399ed..5734edf 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4546,7 +4546,7 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
// The link implementation is the default link interface.
cmLinkImplementationLibraries const*
impl = this->GetLinkImplementationLibrariesInternal(config,
- headTarget->Target);
+ headTarget);
iface.ImplementationIsInterface = true;
iface.WrongConfigLibraries = impl->WrongConfigLibraries;
}
@@ -4990,7 +4990,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
{
// The link implementation is the default link interface.
cmLinkImplementationLibraries const* impl =
- this->GetLinkImplementationLibrariesInternal(config, headTarget->Target);
+ this->GetLinkImplementationLibrariesInternal(config, headTarget);
iface.Libraries.insert(iface.Libraries.end(),
impl->Libraries.begin(), impl->Libraries.end());
if(this->Target->GetPolicyStatusCMP0022() == cmPolicies::WARN &&
@@ -5263,13 +5263,13 @@ cmLinkImplementationLibraries const*
cmGeneratorTarget::GetLinkImplementationLibraries(
const std::string& config) const
{
- return this->GetLinkImplementationLibrariesInternal(config, this->Target);
+ return this->GetLinkImplementationLibrariesInternal(config, this);
}
//----------------------------------------------------------------------------
cmLinkImplementationLibraries const*
cmGeneratorTarget::GetLinkImplementationLibrariesInternal(
- const std::string& config, cmTarget const* head) const
+ const std::string& config, cmGeneratorTarget const* head) const
{
// There is no link implementation for imported targets.
if(this->IsImported())
@@ -5289,11 +5289,11 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal(
return &hm.begin()->second;
}
- cmOptionalLinkImplementation& impl = hm[head];
+ cmOptionalLinkImplementation& impl = hm[head->Target];
if(!impl.LibrariesDone)
{
impl.LibrariesDone = true;
- this->ComputeLinkImplementationLibraries(config, impl, head);
+ this->ComputeLinkImplementationLibraries(config, impl, head->Target);
}
return &impl;
}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index b832eea..7588a59 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -524,7 +524,7 @@ private:
cmLinkImplementationLibraries const*
GetLinkImplementationLibrariesInternal(const std::string& config,
- cmTarget const* head) const;
+ const cmGeneratorTarget* head) const;
bool
ComputeOutputDir(const std::string& config,
bool implib, std::string& out) const;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6e1f05c154d123b01bfe75c13d3e016c9074f72
commit a6e1f05c154d123b01bfe75c13d3e016c9074f72
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 04:55:52 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:21:11 2015 +0200
cmGeneratorTarget: Port ComputeLinkInterface away from cmTarget.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index a15d016..e7399ed 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4485,7 +4485,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
iface.AllDone = true;
if(iface.Exists)
{
- this->ComputeLinkInterface(config, iface, head->Target);
+ this->ComputeLinkInterface(config, iface, head);
}
}
@@ -4495,7 +4495,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
//----------------------------------------------------------------------------
void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
cmOptionalLinkInterface &iface,
- cmTarget const* headTarget) const
+ cmGeneratorTarget const* headTarget) const
{
if(iface.ExplicitLibraries)
{
@@ -4545,7 +4545,8 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
{
// The link implementation is the default link interface.
cmLinkImplementationLibraries const*
- impl = this->GetLinkImplementationLibrariesInternal(config, headTarget);
+ impl = this->GetLinkImplementationLibrariesInternal(config,
+ headTarget->Target);
iface.ImplementationIsInterface = true;
iface.WrongConfigLibraries = impl->WrongConfigLibraries;
}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index bbd06a6..b832eea 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -112,7 +112,7 @@ public:
const cmGeneratorTarget* headTarget) const;
void ComputeLinkInterface(const std::string& config,
cmOptionalLinkInterface& iface,
- cmTarget const* head) const;
+ const cmGeneratorTarget* head) const;
cmLinkInterfaceLibraries const*
GetLinkInterfaceLibraries(const std::string& config,
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=654002feb88a9a219e2d6b6011c7dccc791627b1
commit 654002feb88a9a219e2d6b6011c7dccc791627b1
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 04:50:32 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:21:09 2015 +0200
cmGeneratorTarget: Port ComputeLinkInterfaceLibraries away from cmTarget.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 67920af..a15d016 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4478,7 +4478,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
{
iface.LibrariesDone = true;
this->ComputeLinkInterfaceLibraries(
- config, iface, head->Target, false);
+ config, iface, head, false);
}
if(!iface.AllDone)
{
@@ -4629,7 +4629,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
{
iface.LibrariesDone = true;
this->ComputeLinkInterfaceLibraries(
- config, iface, head->Target, usage_requirements_only);
+ config, iface, head, usage_requirements_only);
}
return iface.Exists? &iface : 0;
@@ -4890,7 +4890,7 @@ void
cmGeneratorTarget::ComputeLinkInterfaceLibraries(
const std::string& config,
cmOptionalLinkInterface& iface,
- cmTarget const* headTarget,
+ cmGeneratorTarget const* headTarget,
bool usage_requirements_only) const
{
// Construct the property name suffix for this configuration.
@@ -4976,7 +4976,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
// The interface libraries have been explicitly set.
this->ExpandLinkItems(linkIfaceProp, explicitLibraries,
config,
- headTarget, usage_requirements_only,
+ headTarget->Target, usage_requirements_only,
iface.Libraries,
iface.HadHeadSensitiveCondition);
}
@@ -4989,7 +4989,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
{
// The link implementation is the default link interface.
cmLinkImplementationLibraries const* impl =
- this->GetLinkImplementationLibrariesInternal(config, headTarget);
+ this->GetLinkImplementationLibrariesInternal(config, headTarget->Target);
iface.Libraries.insert(iface.Libraries.end(),
impl->Libraries.begin(), impl->Libraries.end());
if(this->Target->GetPolicyStatusCMP0022() == cmPolicies::WARN &&
@@ -5003,8 +5003,9 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
{
bool hadHeadSensitiveConditionDummy = false;
this->ExpandLinkItems(newProp, newExplicitLibraries, config,
- headTarget, usage_requirements_only,
- ifaceLibs, hadHeadSensitiveConditionDummy);
+ headTarget->Target,
+ usage_requirements_only,
+ ifaceLibs, hadHeadSensitiveConditionDummy);
}
if (ifaceLibs != iface.Libraries)
{
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index f3eaccd..bbd06a6 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -121,7 +121,7 @@ public:
void ComputeLinkInterfaceLibraries(const std::string& config,
cmOptionalLinkInterface &iface,
- cmTarget const* head,
+ const cmGeneratorTarget* head,
bool usage_requirements_only) const;
/** Get the full path to the target according to the settings in its
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=922c89014f372ca38303b4258345c23027046616
commit 922c89014f372ca38303b4258345c23027046616
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 04:49:37 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:20:30 2015 +0200
cmGeneratorTarget: Port GetLinkInterface away from cmTarget.
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index a9e8cfc..7d20827 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -365,7 +365,7 @@ void cmComputeLinkDepends::FollowLinkEntry(BFSEntry const& qe)
{
// Follow the target dependencies.
if(cmLinkInterface const* iface =
- entry.Target->GetLinkInterface(this->Config, this->Target->Target))
+ entry.Target->GetLinkInterface(this->Config, this->Target))
{
const bool isIface =
entry.Target->GetType() == cmTarget::INTERFACE_LIBRARY;
@@ -465,7 +465,7 @@ void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep)
if(entry.Target)
{
if(cmLinkInterface const* iface =
- entry.Target->GetLinkInterface(this->Config, this->Target->Target))
+ entry.Target->GetLinkInterface(this->Config, this->Target))
{
// Follow public and private dependencies transitively.
this->FollowSharedDeps(index, iface, true);
@@ -937,7 +937,7 @@ int cmComputeLinkDepends::ComputeComponentCount(NodeList const& nl)
if(cmGeneratorTarget const* target = this->EntryList[*ni].Target)
{
if(cmLinkInterface const* iface =
- target->GetLinkInterface(this->Config, this->Target->Target))
+ target->GetLinkInterface(this->Config, this->Target))
{
if(iface->Multiplicity > count)
{
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 9e37c35..18aad10 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -297,7 +297,7 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
cmGeneratorTarget const* depender = this->Targets[depender_index];
if(cmLinkInterface const* iface =
dependee->GetLinkInterface(config,
- depender->Target))
+ depender))
{
for(std::vector<cmLinkItem>::const_iterator
lib = iface->Libraries.begin();
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 881acee..d6149b3 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -799,7 +799,7 @@ cmExportFileGenerator
{
// Add the transitive link dependencies for this configuration.
cmLinkInterface const* iface = target->GetLinkInterface(config,
- target->Target);
+ target);
if (!iface)
{
return;
@@ -911,7 +911,7 @@ cmExportFileGenerator
// Add the transitive link dependencies for this configuration.
if(cmLinkInterface const* iface =
- target->GetLinkInterface(config, target->Target))
+ target->GetLinkInterface(config, target))
{
this->SetImportLinkProperty(suffix, target,
"IMPORTED_LINK_INTERFACE_LANGUAGES",
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 13ef2a0..67920af 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1719,7 +1719,7 @@ public:
this->Target->GetLocalGenerator()->GetGlobalGenerator()
->GetGeneratorTarget(item.Target);
cmLinkInterface const* iface =
- gtgt->GetLinkInterface(this->Config, this->HeadTarget->Target);
+ gtgt->GetLinkInterface(this->Config, this->HeadTarget);
if(!iface) { return; }
for(std::vector<std::string>::const_iterator
@@ -4446,12 +4446,12 @@ void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
//----------------------------------------------------------------------------
cmLinkInterface const*
cmGeneratorTarget::GetLinkInterface(const std::string& config,
- cmTarget const* head) const
+ cmGeneratorTarget const* head) const
{
// Imported targets have their own link interface.
if(this->IsImported())
{
- return this->GetImportLinkInterface(config, head, false);
+ return this->GetImportLinkInterface(config, head->Target, false);
}
// Link interfaces are not supported for executables that do not
@@ -4473,19 +4473,19 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
return &hm.begin()->second;
}
- cmOptionalLinkInterface& iface = hm[head];
+ cmOptionalLinkInterface& iface = hm[head->Target];
if(!iface.LibrariesDone)
{
iface.LibrariesDone = true;
this->ComputeLinkInterfaceLibraries(
- config, iface, head, false);
+ config, iface, head->Target, false);
}
if(!iface.AllDone)
{
iface.AllDone = true;
if(iface.Exists)
{
- this->ComputeLinkInterface(config, iface, head);
+ this->ComputeLinkInterface(config, iface, head->Target);
}
}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index c36117d..f3eaccd 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -109,7 +109,7 @@ public:
const std::string& config) const;
cmLinkInterface const* GetLinkInterface(const std::string& config,
- cmTarget const* headTarget) const;
+ const cmGeneratorTarget* headTarget) const;
void ComputeLinkInterface(const std::string& config,
cmOptionalLinkInterface& iface,
cmTarget const* head) const;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eaa5b9cbb1b145b76eb0448df1ce3a3c63ee13c6
commit eaa5b9cbb1b145b76eb0448df1ce3a3c63ee13c6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 04:46:15 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:14:32 2015 +0200
cmGeneratorTarget: Port cmTargetCollectLinkLanguages away from cmTarget.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 99d1013..13ef2a0 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1667,7 +1667,7 @@ public:
cmTargetCollectLinkLanguages(cmGeneratorTarget const* target,
const std::string& config,
UNORDERED_SET<std::string>& languages,
- cmTarget const* head):
+ cmGeneratorTarget const* head):
Config(config), Languages(languages), HeadTarget(head),
Makefile(target->Target->GetMakefile()), Target(target)
{ this->Visited.insert(target->Target); }
@@ -1719,7 +1719,7 @@ public:
this->Target->GetLocalGenerator()->GetGlobalGenerator()
->GetGeneratorTarget(item.Target);
cmLinkInterface const* iface =
- gtgt->GetLinkInterface(this->Config, this->HeadTarget);
+ gtgt->GetLinkInterface(this->Config, this->HeadTarget->Target);
if(!iface) { return; }
for(std::vector<std::string>::const_iterator
@@ -1737,7 +1737,7 @@ public:
private:
std::string Config;
UNORDERED_SET<std::string>& Languages;
- cmTarget const* HeadTarget;
+ cmGeneratorTarget const* HeadTarget;
cmMakefile* Makefile;
const cmGeneratorTarget* Target;
std::set<cmTarget const*> Visited;
@@ -1830,7 +1830,7 @@ void cmGeneratorTarget::ComputeLinkClosure(const std::string& config,
}
// Add interface languages from linked targets.
- cmTargetCollectLinkLanguages cll(this, config, languages, this->Target);
+ cmTargetCollectLinkLanguages cll(this, config, languages, this);
for(std::vector<cmLinkImplItem>::const_iterator li = impl->Libraries.begin();
li != impl->Libraries.end(); ++li)
{
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f539da126b55933fae6f40feea35e820cb632877
commit f539da126b55933fae6f40feea35e820cb632877
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 04:45:43 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:14:31 2015 +0200
cmGeneratorTarget: Port GetLinkInterfaceLibraries away from cmTarget.
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index fdacc82..78a5b6f 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1109,8 +1109,11 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
if(isInterfaceProperty)
{
+ cmGeneratorTarget* gHeadTarget =
+ context->Makefile->GetGlobalGenerator()
+ ->GetGeneratorTarget(headTarget);
if(cmLinkInterfaceLibraries const* iface =
- gtgt->GetLinkInterfaceLibraries(context->Config, headTarget, true))
+ gtgt->GetLinkInterfaceLibraries(context->Config, gHeadTarget, true))
{
linkedTargetsContent =
getLinkedTargetsContent(iface->Libraries, target,
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 71506d1..99d1013 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2058,7 +2058,7 @@ void processILibs(const std::string& config,
tgts.push_back(item.Target);
cmGeneratorTarget* gt = gg->GetGeneratorTarget(item.Target);
if(cmLinkInterfaceLibraries const* iface =
- gt->GetLinkInterfaceLibraries(config, headTarget->Target, true))
+ gt->GetLinkInterfaceLibraries(config, headTarget, true))
{
for(std::vector<cmLinkItem>::const_iterator
it = iface->Libraries.begin();
@@ -4592,13 +4592,13 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
//----------------------------------------------------------------------------
const cmLinkInterfaceLibraries *
cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
- cmTarget const* head,
+ cmGeneratorTarget const* head,
bool usage_requirements_only) const
{
// Imported targets have their own link interface.
if(this->IsImported())
{
- return this->GetImportLinkInterface(config, head,
+ return this->GetImportLinkInterface(config, head->Target,
usage_requirements_only);
}
@@ -4624,12 +4624,12 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
return &hm.begin()->second;
}
- cmOptionalLinkInterface& iface = hm[head];
+ cmOptionalLinkInterface& iface = hm[head->Target];
if(!iface.LibrariesDone)
{
iface.LibrariesDone = true;
this->ComputeLinkInterfaceLibraries(
- config, iface, head, usage_requirements_only);
+ config, iface, head->Target, usage_requirements_only);
}
return iface.Exists? &iface : 0;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 49de632..c36117d 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -116,7 +116,7 @@ public:
cmLinkInterfaceLibraries const*
GetLinkInterfaceLibraries(const std::string& config,
- cmTarget const* headTarget,
+ const cmGeneratorTarget* headTarget,
bool usage_requirements_only) const;
void ComputeLinkInterfaceLibraries(const std::string& config,
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c5d70f9c2b9b7e2aeaf1515ef72a6e9282ecde0
commit 1c5d70f9c2b9b7e2aeaf1515ef72a6e9282ecde0
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 04:40:14 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:14:31 2015 +0200
cmGeneratorTarget: Port processILibs away from cmTarget.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 8ff78e0..71506d1 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2047,7 +2047,7 @@ void cmGeneratorTarget::GetAutoUicOptions(std::vector<std::string> &result,
//----------------------------------------------------------------------------
void processILibs(const std::string& config,
- cmTarget const* headTarget,
+ cmGeneratorTarget const* headTarget,
cmLinkItem const& item,
cmGlobalGenerator* gg,
std::vector<cmTarget const*>& tgts,
@@ -2058,7 +2058,7 @@ void processILibs(const std::string& config,
tgts.push_back(item.Target);
cmGeneratorTarget* gt = gg->GetGeneratorTarget(item.Target);
if(cmLinkInterfaceLibraries const* iface =
- gt->GetLinkInterfaceLibraries(config, headTarget, true))
+ gt->GetLinkInterfaceLibraries(config, headTarget->Target, true))
{
for(std::vector<cmLinkItem>::const_iterator
it = iface->Libraries.begin();
@@ -2089,7 +2089,7 @@ cmGeneratorTarget::GetLinkImplementationClosure(
it = impl->Libraries.begin();
it != impl->Libraries.end(); ++it)
{
- processILibs(config, this->Target, *it,
+ processILibs(config, this, *it,
this->LocalGenerator->GetGlobalGenerator(),
tgts , emitted);
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=064c2488119269e88422ea444f87bdd44c4f6589
commit 064c2488119269e88422ea444f87bdd44c4f6589
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:41:15 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:14:31 2015 +0200
cmComputeLinkDepends: Port some API to cmGeneratorTarget.
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 1b5c9f4..a9e8cfc 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -268,7 +268,7 @@ cmComputeLinkDepends::Compute()
{
int i = *li;
LinkEntry const& e = this->EntryList[i];
- cmTarget const* t = e.Target;
+ cmGeneratorTarget const* t = e.Target;
// Entries that we know the linker will re-use do not need to be repeated.
bool uniquify = t && t->GetType() == cmTarget::SHARED_LIBRARY;
if(!uniquify || emmitted.insert(i).second)
@@ -320,7 +320,8 @@ int cmComputeLinkDepends::AddLinkEntry(cmLinkItem const& item)
int index = lei->second;
LinkEntry& entry = this->EntryList[index];
entry.Item = item;
- entry.Target = item.Target;
+ entry.Target =
+ item.Target ? this->GlobalGenerator->GetGeneratorTarget(item.Target) : 0;
entry.IsFlag = (!entry.Target && item[0] == '-' && item[1] != 'l' &&
item.substr(0, 10) != "-framework");
@@ -362,11 +363,9 @@ void cmComputeLinkDepends::FollowLinkEntry(BFSEntry const& qe)
// Follow the item's dependencies.
if(entry.Target)
{
- cmGeneratorTarget* gtgt =
- this->GlobalGenerator->GetGeneratorTarget(entry.Target);
// Follow the target dependencies.
if(cmLinkInterface const* iface =
- gtgt->GetLinkInterface(this->Config, this->Target->Target))
+ entry.Target->GetLinkInterface(this->Config, this->Target->Target))
{
const bool isIface =
entry.Target->GetType() == cmTarget::INTERFACE_LIBRARY;
@@ -444,7 +443,9 @@ void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep)
// Initialize the item entry.
LinkEntry& entry = this->EntryList[lei->second];
entry.Item = dep.Item;
- entry.Target = dep.Item.Target;
+ entry.Target =
+ dep.Item.Target ?
+ this->GlobalGenerator->GetGeneratorTarget(dep.Item.Target) : 0;
// This item was added specifically because it is a dependent
// shared library. It may get special treatment
@@ -463,10 +464,8 @@ void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep)
// Target items may have their own dependencies.
if(entry.Target)
{
- cmGeneratorTarget* gtgt =
- this->GlobalGenerator->GetGeneratorTarget(entry.Target);
if(cmLinkInterface const* iface =
- gtgt->GetLinkInterface(this->Config, this->Target->Target))
+ entry.Target->GetLinkInterface(this->Config, this->Target->Target))
{
// Follow public and private dependencies transitively.
this->FollowSharedDeps(index, iface, true);
@@ -639,15 +638,16 @@ cmTarget const* cmComputeLinkDepends::FindTargetToLink(int depender_index,
const std::string& name)
{
// Look for a target in the scope of the depender.
- cmTarget const* from = this->Target->Target;
+ cmGeneratorTarget const* from = this->Target;
if(depender_index >= 0)
{
- if(cmTarget const* depender = this->EntryList[depender_index].Target)
+ if(cmGeneratorTarget const* depender =
+ this->EntryList[depender_index].Target)
{
from = depender;
}
}
- return from->FindTargetToLink(name);
+ return from->Target->FindTargetToLink(name);
}
//----------------------------------------------------------------------------
@@ -934,12 +934,10 @@ int cmComputeLinkDepends::ComputeComponentCount(NodeList const& nl)
int count = 2;
for(NodeList::const_iterator ni = nl.begin(); ni != nl.end(); ++ni)
{
- if(cmTarget const* target = this->EntryList[*ni].Target)
+ if(cmGeneratorTarget const* target = this->EntryList[*ni].Target)
{
- cmGeneratorTarget* gtgt =
- this->GlobalGenerator->GetGeneratorTarget(target);
if(cmLinkInterface const* iface =
- gtgt->GetLinkInterface(this->Config, this->Target->Target))
+ target->GetLinkInterface(this->Config, this->Target->Target))
{
if(iface->Multiplicity > count)
{
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 2cbb430..5ad8714 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -23,7 +23,6 @@ class cmComputeComponentGraph;
class cmGlobalGenerator;
class cmMakefile;
class cmGeneratorTarget;
-class cmTarget;
class cmake;
/** \class cmComputeLinkDepends
@@ -40,7 +39,7 @@ public:
struct LinkEntry
{
std::string Item;
- cmTarget const* Target;
+ cmGeneratorTarget const* Target;
bool IsSharedDep;
bool IsFlag;
LinkEntry(): Item(), Target(0), IsSharedDep(false), IsFlag(false) {}
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 9371546..7e34611 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -632,11 +632,11 @@ void cmComputeLinkInformation::AddImplicitLinkInfo(std::string const& lang)
//----------------------------------------------------------------------------
void cmComputeLinkInformation::AddItem(std::string const& item,
- cmTarget const* tgt)
+ cmGeneratorTarget const* tgt)
{
// Compute the proper name to use to link this library.
const std::string& config = this->Config;
- bool impexe = (tgt && tgt->IsExecutableWithExports());
+ bool impexe = (tgt && tgt->Target->IsExecutableWithExports());
if(impexe && !this->UseImportLibrary && !this->LoaderFlag)
{
// Skip linking to executables on platforms with no import
@@ -644,9 +644,8 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
return;
}
- if(tgt && tgt->IsLinkable())
+ if(tgt && tgt->Target->IsLinkable())
{
- cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(tgt);
// This is a CMake target. Ask the target for its real name.
if(impexe && this->LoaderFlag)
{
@@ -656,10 +655,10 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
std::string linkItem;
linkItem = this->LoaderFlag;
- std::string exe = gtgt->GetFullPath(config, this->UseImportLibrary,
+ std::string exe = tgt->GetFullPath(config, this->UseImportLibrary,
true);
linkItem += exe;
- this->Items.push_back(Item(linkItem, true, tgt));
+ this->Items.push_back(Item(linkItem, true, tgt->Target));
this->Depends.push_back(exe);
}
else if(tgt->GetType() == cmTarget::INTERFACE_LIBRARY)
@@ -667,7 +666,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
// Add the interface library as an item so it can be considered as part
// of COMPATIBLE_INTERFACE_ enforcement. The generators will ignore
// this for the actual link line.
- this->Items.push_back(Item(std::string(), true, tgt));
+ this->Items.push_back(Item(std::string(), true, tgt->Target));
}
else
{
@@ -677,15 +676,15 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
(impexe || tgt->GetType() == cmTarget::SHARED_LIBRARY));
// Pass the full path to the target file.
- std::string lib = gtgt->GetFullPath(config, implib, true);
+ std::string lib = tgt->GetFullPath(config, implib, true);
if(!this->LinkDependsNoShared ||
tgt->GetType() != cmTarget::SHARED_LIBRARY)
{
this->Depends.push_back(lib);
}
- this->AddTargetItem(lib, tgt);
- this->AddLibraryRuntimeInfo(lib, tgt);
+ this->AddTargetItem(lib, tgt->Target);
+ this->AddLibraryRuntimeInfo(lib, tgt->Target);
}
}
else
@@ -716,7 +715,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
//----------------------------------------------------------------------------
void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
- cmTarget const* tgt)
+ const cmGeneratorTarget* tgt)
{
// If dropping shared library dependencies, ignore them.
if(this->SharedDependencyMode == SharedDepModeNone)
@@ -760,18 +759,14 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
return;
}
- cmGeneratorTarget *gtgt = 0;
-
// Get a full path to the dependent shared library.
// Add it to the runtime path computation so that the target being
// linked will be able to find it.
std::string lib;
if(tgt)
{
- gtgt = this->GlobalGenerator->GetGeneratorTarget(tgt);
-
- lib = gtgt->GetFullPath(this->Config, this->UseImportLibrary);
- this->AddLibraryRuntimeInfo(lib, tgt);
+ lib = tgt->GetFullPath(this->Config, this->UseImportLibrary);
+ this->AddLibraryRuntimeInfo(lib, tgt->Target);
}
else
{
@@ -795,9 +790,9 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
}
if(order)
{
- if(gtgt)
+ if(tgt)
{
- std::string soName = gtgt->GetSOName(this->Config);
+ std::string soName = tgt->GetSOName(this->Config);
const char* soname = soName.empty()? 0 : soName.c_str();
order->AddRuntimeLibrary(lib, soname);
}
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index 8b83574..b1e7e46 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -62,8 +62,8 @@ public:
std::string const& GetRPathLinkFlag() const { return this->RPathLinkFlag; }
std::string GetRPathLinkString();
private:
- void AddItem(std::string const& item, cmTarget const* tgt);
- void AddSharedDepItem(std::string const& item, cmTarget const* tgt);
+ void AddItem(std::string const& item, const cmGeneratorTarget* tgt);
+ void AddSharedDepItem(std::string const& item, cmGeneratorTarget const* tgt);
// Output information.
ItemVector Items;
-----------------------------------------------------------------------
Summary of changes:
Source/cmComputeLinkDepends.cxx | 30 ++++++++----------
Source/cmComputeLinkDepends.h | 3 +-
Source/cmComputeLinkInformation.cxx | 33 ++++++++-----------
Source/cmComputeLinkInformation.h | 4 +--
Source/cmComputeTargetDepends.cxx | 2 +-
Source/cmExportFileGenerator.cxx | 4 +--
Source/cmGeneratorExpressionNode.cxx | 5 ++-
Source/cmGeneratorTarget.cxx | 58 ++++++++++++++++++----------------
Source/cmGeneratorTarget.h | 18 ++++++-----
9 files changed, 78 insertions(+), 79 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list