[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-332-g5206c7e
Stephen Kelly
steveire at gmail.com
Sat Oct 10 06:37:38 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 5206c7ef959e078473c01cc0ad8adb210f1bef66 (commit)
via db4b5fb5712037f60eeabaa13d5e6b0c152218e3 (commit)
from d4508aa255bf74773774cf685f6b60b7c683df01 (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=5206c7ef959e078473c01cc0ad8adb210f1bef66
commit 5206c7ef959e078473c01cc0ad8adb210f1bef66
Merge: d4508aa db4b5fb
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 06:37:32 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 06:37:32 2015 -0400
Merge topic 'use-generator-target' into next
db4b5fb5 Partial revert.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db4b5fb5712037f60eeabaa13d5e6b0c152218e3
commit db4b5fb5712037f60eeabaa13d5e6b0c152218e3
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 12:36:27 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:36:48 2015 +0200
Partial revert.
diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index f901414..b9ed345 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -383,7 +383,7 @@ std::vector<std::string>
cmCommonTargetGenerator::GetLinkedTargetDirectories() const
{
std::vector<std::string> dirs;
- std::set<cmGeneratorTarget const*> emitted;
+ std::set<cmTarget const*> emitted;
if (cmComputeLinkInformation* cli =
this->GeneratorTarget->GetLinkInformation(this->ConfigName))
{
@@ -397,7 +397,7 @@ cmCommonTargetGenerator::GetLinkedTargetDirectories() const
// Target->GetLinkInformation already processed their
// link interface and they don't have any output themselves.
&& linkee->GetType() != cmTarget::INTERFACE_LIBRARY
- && emitted.insert(linkee).second)
+ && emitted.insert(linkee->Target).second)
{
cmLocalGenerator* lg = linkee->GetLocalGenerator();
cmMakefile* mf = linkee->Target->GetMakefile();
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 66e4c4b..4d7b01e 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -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");
@@ -442,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
@@ -526,17 +529,15 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
}
}
- const cmGeneratorTarget* gtgt =
- this->FindTargetToLink(depender_index, *di);
// If the library is meant for this link type then use it.
if(llt == cmTarget::GENERAL || llt == this->LinkType)
{
- cmLinkItem item(*di, gtgt);
+ cmLinkItem item(*di, this->FindTargetToLink(depender_index, *di));
actual_libs.push_back(item);
}
else if(this->OldLinkDirMode)
{
- cmLinkItem item(*di, gtgt);
+ cmLinkItem item(*di, this->FindTargetToLink(depender_index, *di));
this->CheckWrongConfigItem(item);
}
@@ -633,9 +634,8 @@ cmComputeLinkDepends::AddLinkEntries(
}
//----------------------------------------------------------------------------
-cmGeneratorTarget const*
-cmComputeLinkDepends::FindTargetToLink(int depender_index,
- const std::string& name)
+cmTarget const* cmComputeLinkDepends::FindTargetToLink(int depender_index,
+ const std::string& name)
{
// Look for a target in the scope of the depender.
cmGeneratorTarget const* from = this->Target;
@@ -647,9 +647,7 @@ cmComputeLinkDepends::FindTargetToLink(int depender_index,
from = depender;
}
}
-
- return this->GlobalGenerator->GetGeneratorTarget(
- from->Target->FindTargetToLink(name));
+ return from->Target->FindTargetToLink(name);
}
//----------------------------------------------------------------------------
@@ -984,6 +982,7 @@ void cmComputeLinkDepends::CheckWrongConfigItem(cmLinkItem const& item)
// directories.
if(item.Target && !item.Target->IsImported())
{
- this->OldWrongConfigItems.insert(item.Target);
+ this->OldWrongConfigItems.insert(
+ this->GlobalGenerator->GetGeneratorTarget(item.Target));
}
}
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 9d960c6..dba3948 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -75,8 +75,8 @@ private:
void AddDirectLinkEntries();
template <typename T>
void AddLinkEntries(int depender_index, std::vector<T> const& libs);
- cmGeneratorTarget const* FindTargetToLink(int depender_index,
- const std::string& name);
+ cmTarget const* FindTargetToLink(int depender_index,
+ const std::string& name);
// One entry for each unique item.
std::vector<LinkEntry> EntryList;
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 8f3def2..e53b7b9 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -319,20 +319,22 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
std::set<std::string> &emitted)
{
cmGeneratorTarget const* depender = this->Targets[depender_index];
- cmGeneratorTarget const* dependee = dependee_name.Target;
+ cmTarget const* dependee = dependee_name.Target;
// Skip targets that will not really be linked. This is probably a
// name conflict between an external library and an executable
// within the project.
if(dependee &&
dependee->GetType() == cmTarget::EXECUTABLE &&
- !dependee->Target->IsExecutableWithExports())
+ !dependee->IsExecutableWithExports())
{
dependee = 0;
}
if(dependee)
{
- this->AddInterfaceDepends(depender_index, dependee, "", emitted);
+ cmGeneratorTarget* gt =
+ this->GlobalGenerator->GetGeneratorTarget(dependee);
+ this->AddInterfaceDepends(depender_index, gt, "", emitted);
std::vector<std::string> configs;
depender->Makefile->GetConfigurations(configs);
for (std::vector<std::string>::const_iterator it = configs.begin();
@@ -340,7 +342,7 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
{
// A target should not depend on itself.
emitted.insert(depender->GetName());
- this->AddInterfaceDepends(depender_index, dependee, *it, emitted);
+ this->AddInterfaceDepends(depender_index, gt, *it, emitted);
}
}
}
@@ -354,7 +356,7 @@ void cmComputeTargetDepends::AddTargetDepend(
cmGeneratorTarget const* depender = this->Targets[depender_index];
// Check the target's makefile first.
- cmGeneratorTarget const* dependee = dependee_name.Target;
+ cmTarget const* dependee = dependee_name.Target;
if(!dependee && !linking &&
(depender->GetType() != cmTarget::GLOBAL_TARGET))
@@ -401,14 +403,16 @@ void cmComputeTargetDepends::AddTargetDepend(
// within the project.
if(linking && dependee &&
dependee->GetType() == cmTarget::EXECUTABLE &&
- !dependee->Target->IsExecutableWithExports())
+ !dependee->IsExecutableWithExports())
{
dependee = 0;
}
if(dependee)
{
- this->AddTargetDepend(depender_index, dependee, linking);
+ cmGeneratorTarget* gt =
+ this->GlobalGenerator->GetGeneratorTarget(dependee);
+ this->AddTargetDepend(depender_index, gt, linking);
}
}
@@ -426,9 +430,11 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
for(std::set<cmLinkItem>::const_iterator i = utils.begin();
i != utils.end(); ++i)
{
- if(cmGeneratorTarget const* transitive_dependee = i->Target)
+ if(cmTarget const* transitive_dependee = i->Target)
{
- this->AddTargetDepend(depender_index, transitive_dependee, false);
+ cmGeneratorTarget* gt =
+ this->GlobalGenerator->GetGeneratorTarget(transitive_dependee);
+ this->AddTargetDepend(depender_index, gt, false);
}
}
}
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 400fa17..fed0dbc 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -217,7 +217,7 @@ cmExportBuildFileGenerator
std::string prop = "IMPORTED_IMPLIB";
prop += suffix;
std::string value = target->GetFullPath(config, true);
- target->GetImplibGNUtoMS(value, value,
+ target->Target->GetImplibGNUtoMS(value, value,
"${CMAKE_IMPORT_LIBRARY_SUFFIX}");
properties[prop] = value;
}
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 21c71b0..11410a7 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -255,9 +255,9 @@ void cmExtraSublimeTextGenerator::
}
std::vector<std::string>& flags = sourceFileFlagsIter->second;
std::string flagsString =
- this->ComputeFlagsForObject(*iter, lg, gtgt);
+ this->ComputeFlagsForObject(*iter, lg, target, gtgt);
std::string definesString =
- this->ComputeDefines(*iter, lg, gtgt);
+ this->ComputeDefines(*iter, lg, target, gtgt);
flags.clear();
cmsys::RegularExpression flagRegex;
// Regular expression to extract compiler flags from a string
@@ -365,6 +365,7 @@ std::string cmExtraSublimeTextGenerator::BuildMakeCommand(
std::string
cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
cmLocalGenerator* lg,
+ cmTarget *target,
cmGeneratorTarget* gtgt)
{
std::string flags;
@@ -389,7 +390,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
// }
// Add shared-library flags if needed.
- lg->AddCMP0018Flags(flags, gtgt->Target, language, config);
+ lg->AddCMP0018Flags(flags, target, language, config);
// Add include directory flags.
{
@@ -404,7 +405,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
lg->AppendFlags(flags, makefile->GetDefineFlags());
// Add target-specific flags.
- lg->AddCompileOptions(flags, gtgt->Target, language, config);
+ lg->AddCompileOptions(flags, target, language, config);
// Add source file specific flags.
lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS"));
@@ -418,8 +419,8 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
// void cmMakefileTargetGenerator::WriteTargetLanguageFlags().
std::string
cmExtraSublimeTextGenerator::
-ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
- cmGeneratorTarget* target)
+ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, cmTarget *target,
+ cmGeneratorTarget*)
{
std::set<std::string> defines;
@@ -428,13 +429,13 @@ ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
const std::string& config = makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
// Add the export symbol definition for shared library objects.
- if(const char* exportMacro = target->Target->GetExportMacro())
+ if(const char* exportMacro = target->GetExportMacro())
{
lg->AppendDefines(defines, exportMacro);
}
// Add preprocessor definitions for this target and configuration.
- lg->AddCompileDefinitions(defines, target->Target, config, language);
+ lg->AddCompileDefinitions(defines, target, config, language);
lg->AppendDefines(defines, source->GetProperty("COMPILE_DEFINITIONS"));
{
std::string defPropName = "COMPILE_DEFINITIONS_";
diff --git a/Source/cmExtraSublimeTextGenerator.h b/Source/cmExtraSublimeTextGenerator.h
index 5dd1140..4173b7d 100644
--- a/Source/cmExtraSublimeTextGenerator.h
+++ b/Source/cmExtraSublimeTextGenerator.h
@@ -79,10 +79,11 @@ private:
*/
std::string ComputeFlagsForObject(cmSourceFile *source,
cmLocalGenerator* lg,
+ cmTarget *target,
cmGeneratorTarget* gtgt);
std::string ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
- cmGeneratorTarget* gtgt);
+ cmTarget *target, cmGeneratorTarget* gtgt);
};
#endif
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 88d10aa..78a5b6f 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -831,8 +831,8 @@ template <typename T>
std::string
getLinkedTargetsContent(
std::vector<T> const &libraries,
- cmGeneratorTarget const* target,
- cmGeneratorTarget const* headTarget,
+ cmTarget const* target,
+ cmTarget const* headTarget,
cmGeneratorExpressionContext *context,
cmGeneratorExpressionDAGChecker *dagChecker,
const std::string &interfacePropertyName)
@@ -858,10 +858,8 @@ getLinkedTargetsContent(
{
linkedTargetsContent =
cmGeneratorExpressionNode::EvaluateDependentExpression(depString,
- target->Target->GetMakefile(),
- context,
- headTarget->Target,
- target->Target, dagChecker);
+ target->GetMakefile(), context,
+ headTarget, target, dagChecker);
}
linkedTargetsContent =
cmGeneratorExpression::StripEmptyListElements(linkedTargetsContent);
@@ -1118,8 +1116,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
gtgt->GetLinkInterfaceLibraries(context->Config, gHeadTarget, true))
{
linkedTargetsContent =
- getLinkedTargetsContent(iface->Libraries, gtgt,
- gHeadTarget,
+ getLinkedTargetsContent(iface->Libraries, target,
+ headTarget,
context, &dagChecker,
interfacePropertyName);
}
@@ -1130,8 +1128,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
gtgt->GetLinkImplementationLibraries(context->Config))
{
linkedTargetsContent =
- getLinkedTargetsContent(impl->Libraries, gtgt,
- gtgt,
+ getLinkedTargetsContent(impl->Libraries, target,
+ target,
context, &dagChecker,
interfacePropertyName);
}
@@ -1660,7 +1658,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactLinkerTag>
return std::string();
}
return target->GetFullPath(context->Config,
- target->HasImportLibrary());
+ target->Target->HasImportLibrary());
}
};
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 8b8ef0f..a5e35a1 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -510,8 +510,7 @@ cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const
return 0;
}
-static void handleSystemIncludesDep(cmMakefile *mf,
- cmGeneratorTarget const* depTgt,
+static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
const std::string& config,
cmGeneratorTarget const* headTarget,
cmGeneratorExpressionDAGChecker *dagChecker,
@@ -525,7 +524,7 @@ static void handleSystemIncludesDep(cmMakefile *mf,
cmSystemTools::ExpandListArgument(ge.Parse(dirs)
->Evaluate(mf,
config, false, headTarget->Target,
- depTgt->Target, dagChecker), result);
+ depTgt, dagChecker), result);
}
if (!depTgt->IsImported() || excludeImported)
{
@@ -539,7 +538,7 @@ static void handleSystemIncludesDep(cmMakefile *mf,
cmSystemTools::ExpandListArgument(ge.Parse(dirs)
->Evaluate(mf,
config, false, headTarget->Target,
- depTgt->Target, dagChecker), result);
+ depTgt, dagChecker), result);
}
}
@@ -774,9 +773,8 @@ std::set<cmLinkItem> const& cmGeneratorTarget::GetUtilityItems() const
for(std::set<std::string>::const_iterator i = utilities.begin();
i != utilities.end(); ++i)
{
- cmGeneratorTarget* gt = this->GlobalGenerator
- ->GetGeneratorTarget(this->Makefile->FindTargetToUse(*i));
- this->UtilityItems.insert(cmLinkItem(*i, gt));
+ this->UtilityItems.insert(
+ cmLinkItem(*i, this->Makefile->FindTargetToUse(*i)));
}
}
return this->UtilityItems;
@@ -883,9 +881,9 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
&dagChecker), result);
}
- std::vector<cmGeneratorTarget const*> const& deps =
+ std::vector<cmTarget const*> const& deps =
this->GetLinkImplementationClosure(config);
- for(std::vector<cmGeneratorTarget const*>::const_iterator
+ for(std::vector<cmTarget const*>::const_iterator
li = deps.begin(), le = deps.end(); li != le; ++li)
{
handleSystemIncludesDep(this->Makefile, *li, config, this,
@@ -1730,12 +1728,15 @@ public:
}
return;
}
- if(!this->Visited.insert(item.Target->Target).second)
+ if(!this->Visited.insert(item.Target).second)
{
return;
}
+ cmGeneratorTarget* gtgt =
+ this->Target->GetLocalGenerator()->GetGlobalGenerator()
+ ->GetGeneratorTarget(item.Target);
cmLinkInterface const* iface =
- item.Target->GetLinkInterface(this->Config, this->HeadTarget);
+ gtgt->GetLinkInterface(this->Config, this->HeadTarget);
if(!iface) { return; }
for(std::vector<std::string>::const_iterator
@@ -2066,14 +2067,15 @@ void processILibs(const std::string& config,
cmGeneratorTarget const* headTarget,
cmLinkItem const& item,
cmGlobalGenerator* gg,
- std::vector<cmGeneratorTarget const*>& tgts,
- std::set<cmGeneratorTarget const*>& emitted)
+ std::vector<cmTarget const*>& tgts,
+ std::set<cmTarget const*>& emitted)
{
if (item.Target && emitted.insert(item.Target).second)
{
tgts.push_back(item.Target);
+ cmGeneratorTarget* gt = gg->GetGeneratorTarget(item.Target);
if(cmLinkInterfaceLibraries const* iface =
- item.Target->GetLinkInterfaceLibraries(config, headTarget, true))
+ gt->GetLinkInterfaceLibraries(config, headTarget, true))
{
for(std::vector<cmLinkItem>::const_iterator
it = iface->Libraries.begin();
@@ -2086,7 +2088,7 @@ void processILibs(const std::string& config,
}
//----------------------------------------------------------------------------
-const std::vector<const cmGeneratorTarget*>&
+const std::vector<const cmTarget*>&
cmGeneratorTarget::GetLinkImplementationClosure(
const std::string& config) const
{
@@ -2095,7 +2097,7 @@ cmGeneratorTarget::GetLinkImplementationClosure(
if(!tgts.Done)
{
tgts.Done = true;
- std::set<cmGeneratorTarget const*> emitted;
+ std::set<cmTarget const*> emitted;
cmLinkImplementationLibraries const* impl
= this->GetLinkImplementationLibraries(config);
@@ -3630,10 +3632,10 @@ cmGeneratorTarget::GetCompatibleInterfaces(std::string const& config) const
compat.Done = true;
compat.PropsBool.insert("POSITION_INDEPENDENT_CODE");
compat.PropsString.insert("AUTOUIC_OPTIONS");
- std::vector<cmGeneratorTarget const*> const& deps =
+ std::vector<cmTarget const*> const& deps =
this->GetLinkImplementationClosure(config);
- for(std::vector<cmGeneratorTarget const*>::const_iterator li =
- deps.begin(); li != deps.end(); ++li)
+ for(std::vector<cmTarget const*>::const_iterator li = deps.begin();
+ li != deps.end(); ++li)
{
#define CM_READ_COMPATIBLE_INTERFACE(X, x) \
if(const char* prop = (*li)->GetProperty("COMPATIBLE_INTERFACE_" #X)) \
@@ -3979,20 +3981,18 @@ std::string compatibilityAgree(CompatibleType t, bool dominant)
//----------------------------------------------------------------------------
template<typename PropertyType>
-PropertyType getTypedProperty(cmGeneratorTarget const* tgt,
- const std::string& prop);
+PropertyType getTypedProperty(cmTarget const* tgt, const std::string& prop);
//----------------------------------------------------------------------------
template<>
-bool getTypedProperty<bool>(cmGeneratorTarget const* tgt,
- const std::string& prop)
+bool getTypedProperty<bool>(cmTarget const* tgt, const std::string& prop)
{
return tgt->GetPropertyAsBool(prop);
}
//----------------------------------------------------------------------------
template<>
-const char *getTypedProperty<const char *>(cmGeneratorTarget const* tgt,
+const char *getTypedProperty<const char *>(cmTarget const* tgt,
const std::string& prop)
{
return tgt->GetProperty(prop);
@@ -4122,7 +4122,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
CompatibleType t,
PropertyType *)
{
- PropertyType propContent = getTypedProperty<PropertyType>(tgt, p);
+ PropertyType propContent = getTypedProperty<PropertyType>(tgt->Target, p);
const bool explicitlySet = tgt->Target->GetProperties()
.find(p)
!= tgt->Target->GetProperties().end();
@@ -4131,7 +4131,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
assert((impliedByUse ^ explicitlySet)
|| (!impliedByUse && !explicitlySet));
- std::vector<cmGeneratorTarget const*> const& deps =
+ std::vector<cmTarget const*> const& deps =
tgt->GetLinkImplementationClosure(config);
if(deps.empty())
@@ -4158,7 +4158,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
}
std::string interfaceProperty = "INTERFACE_" + p;
- for(std::vector<cmGeneratorTarget const*>::const_iterator li =
+ for(std::vector<cmTarget const*>::const_iterator li =
deps.begin();
li != deps.end(); ++li)
{
@@ -4168,11 +4168,11 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
// target itself has a POSITION_INDEPENDENT_CODE which disagrees
// with a dependency.
- cmGeneratorTarget const* theTarget = *li;
+ cmTarget const* theTarget = *li;
- const bool ifaceIsSet = theTarget->Target->GetProperties()
+ const bool ifaceIsSet = theTarget->GetProperties()
.find(interfaceProperty)
- != theTarget->Target->GetProperties().end();
+ != theTarget->GetProperties().end();
PropertyType ifacePropContent =
getTypedProperty<PropertyType>(theTarget,
interfaceProperty);
@@ -4427,9 +4427,7 @@ void cmGeneratorTarget::LookupLinkItems(std::vector<std::string> const& names,
{
continue;
}
- cmGeneratorTarget* gt = this->GlobalGenerator
- ->GetGeneratorTarget(this->Target->FindTargetToLink(name));
- items.push_back(cmLinkItem(name, gt));
+ items.push_back(cmLinkItem(name, this->Target->FindTargetToLink(name)));
}
}
@@ -5399,10 +5397,9 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
}
// The entry is meant for this configuration.
- cmTarget const* tgt = this->Target->FindTargetToLink(name);
- cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(tgt);
impl.Libraries.push_back(
- cmLinkImplItem(name, gt, *btIt, evaluated != *le));
+ cmLinkImplItem(name, this->Target->FindTargetToLink(name),
+ *btIt, evaluated != *le));
}
std::set<std::string> const& seenProps = cge->GetSeenTargetProperties();
@@ -5431,10 +5428,9 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
{
continue;
}
- cmGeneratorTarget* gt = this->GlobalGenerator
- ->GetGeneratorTarget(this->Target->FindTargetToLink(name));
// Support OLD behavior for CMP0003.
- impl.WrongConfigLibraries.push_back(cmLinkItem(name, gt));
+ impl.WrongConfigLibraries.push_back(
+ cmLinkItem(name, this->Target->FindTargetToLink(name)));
}
}
}
@@ -5450,47 +5446,3 @@ cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
}
return "";
}
-
-//----------------------------------------------------------------------------
-bool cmGeneratorTarget::HasImplibGNUtoMS() const
-{
- return this->HasImportLibrary()
- && this->GetPropertyAsBool("GNUtoMS");
-}
-
-//----------------------------------------------------------------------------
-bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName,
- std::string& out, const char* newExt) const
-{
- if(this->HasImplibGNUtoMS() &&
- gnuName.size() > 6 && gnuName.substr(gnuName.size()-6) == ".dll.a")
- {
- out = gnuName.substr(0, gnuName.size()-6);
- out += newExt? newExt : ".lib";
- return true;
- }
- return false;
-}
-
-//----------------------------------------------------------------------------
-bool cmGeneratorTarget::HasImportLibrary() const
-{
- return (this->Target->IsDLLPlatform() &&
- (this->GetType() == cmTarget::SHARED_LIBRARY ||
- this->Target->IsExecutableWithExports()));
-}
-
-//----------------------------------------------------------------------------
-std::string cmGeneratorTarget::GetSupportDirectory() const
-{
- std::string dir = this->Makefile->GetCurrentBinaryDirectory();
- dir += cmake::GetCMakeFilesDirectory();
- dir += "/";
- dir += this->GetName();
-#if defined(__VMS)
- dir += "_dir";
-#else
- dir += ".dir";
-#endif
- return dir;
-}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 23ec7b1..70612f2 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -388,20 +388,6 @@ public:
///! Return the preferred linker language for this target
std::string GetLinkerLanguage(const std::string& config = "") const;
- /** Does this target have a GNU implib to convert to MS format? */
- bool HasImplibGNUtoMS() const;
-
- /** Convert the given GNU import library name (.dll.a) to a name with a new
- extension (.lib or ${CMAKE_IMPORT_LIBRARY_SUFFIX}). */
- bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
- const char* newExt = 0) const;
-
- /** Return whether or not the target has a DLL import library. */
- bool HasImportLibrary() const;
-
- /** Get a build-tree directory in which to place target support files. */
- std::string GetSupportDirectory() const;
-
struct SourceFileFlags
GetTargetSourceFileFlags(const cmSourceFile* sf) const;
@@ -489,7 +475,7 @@ private:
cmGeneratorTarget(cmGeneratorTarget const&);
void operator=(cmGeneratorTarget const&);
- struct LinkImplClosure: public std::vector<cmGeneratorTarget const*>
+ struct LinkImplClosure: public std::vector<cmTarget const*>
{
LinkImplClosure(): Done(false) {}
bool Done;
@@ -567,8 +553,8 @@ private:
std::string& out) const;
public:
- const std::vector<const cmGeneratorTarget*>&
- GetLinkImplementationClosure(const std::string& config) const;
+ std::vector<cmTarget const*> const&
+ GetLinkImplementationClosure(const std::string& config) const;
mutable std::map<std::string, std::string> MaxLanguageStandards;
std::map<std::string, std::string> const&
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 8f69acd..eb4dfee 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2895,14 +2895,13 @@ void cmGlobalGenerator::WriteSummary()
{
continue;
}
- cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
- this->WriteSummary(gt);
- fout << gt->GetSupportDirectory() << "\n";
+ this->WriteSummary(ti->second);
+ fout << ti->second->GetSupportDirectory() << "\n";
}
}
//----------------------------------------------------------------------------
-void cmGlobalGenerator::WriteSummary(cmGeneratorTarget* target)
+void cmGlobalGenerator::WriteSummary(cmTarget* target)
{
// Place the labels file in a per-target support directory.
std::string dir = target->GetSupportDirectory();
@@ -2945,15 +2944,17 @@ void cmGlobalGenerator::WriteSummary(cmGeneratorTarget* target)
fout << "# Source files and their labels\n";
std::vector<cmSourceFile*> sources;
std::vector<std::string> configs;
- target->Target->GetMakefile()->GetConfigurations(configs);
+ target->GetMakefile()->GetConfigurations(configs);
if (configs.empty())
{
configs.push_back("");
}
+ cmGeneratorTarget* gt =
+ this->GetGeneratorTarget(target);
for(std::vector<std::string>::const_iterator ci = configs.begin();
ci != configs.end(); ++ci)
{
- target->GetSourceFiles(sources, *ci);
+ gt->GetSourceFiles(sources, *ci);
}
std::vector<cmSourceFile*>::const_iterator sourcesEnd
= cmRemoveDuplicates(sources);
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 55e3766..b22c695 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -458,7 +458,7 @@ private:
void WriteRuleHashes(std::string const& pfile);
void WriteSummary();
- void WriteSummary(cmGeneratorTarget* target);
+ void WriteSummary(cmTarget* target);
void FinalizeTargetCompileInfo();
virtual void ForceLinkerLanguages();
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 7a0c06b..8c50b36 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -135,7 +135,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
filesFrom.push_back(from1);
filesTo.push_back(to1);
std::string targetNameImportLib;
- if(this->Target->GetImplibGNUtoMS(targetNameImport,
+ if(this->Target->Target->GetImplibGNUtoMS(targetNameImport,
targetNameImportLib))
{
filesFrom.push_back(fromDirConfig + targetNameImportLib);
@@ -199,7 +199,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
filesFrom.push_back(from1);
filesTo.push_back(to1);
std::string targetNameImportLib;
- if(this->Target->GetImplibGNUtoMS(targetNameImport,
+ if(this->Target->Target->GetImplibGNUtoMS(targetNameImport,
targetNameImportLib))
{
filesFrom.push_back(fromDirConfig + targetNameImportLib);
@@ -387,7 +387,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
if(nameType == NameImplib)
{
// Use the import library name.
- if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
+ if(!target->GetImplibGNUtoMS(targetNameImport, fname,
"${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
{
fname = targetNameImport;
@@ -416,7 +416,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
if(nameType == NameImplib)
{
// Use the import library name.
- if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
+ if(!target->GetImplibGNUtoMS(targetNameImport, fname,
"${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
{
fname = targetNameImport;
diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h
index b875cc0..33780a7 100644
--- a/Source/cmLinkItem.h
+++ b/Source/cmLinkItem.h
@@ -16,6 +16,7 @@
#include "cmListFileCache.h"
class cmGeneratorTarget;
+class cmTarget;
// Basic information about each link item.
class cmLinkItem: public std::string
@@ -24,9 +25,9 @@ class cmLinkItem: public std::string
public:
cmLinkItem(): std_string(), Target(0) {}
cmLinkItem(const std_string& n,
- cmGeneratorTarget const* t): std_string(n), Target(t) {}
+ cmTarget const* t): std_string(n), Target(t) {}
cmLinkItem(cmLinkItem const& r): std_string(r), Target(r.Target) {}
- cmGeneratorTarget const* Target;
+ cmTarget const* Target;
};
class cmLinkImplItem: public cmLinkItem
@@ -34,7 +35,7 @@ class cmLinkImplItem: public cmLinkItem
public:
cmLinkImplItem(): cmLinkItem(), Backtrace(), FromGenex(false) {}
cmLinkImplItem(std::string const& n,
- cmGeneratorTarget const* t,
+ cmTarget const* t,
cmListFileBacktrace const& bt,
bool fromGenex):
cmLinkItem(n, t), Backtrace(bt), FromGenex(fromGenex) {}
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 2d2de5f..f6b907e 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -259,7 +259,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::UNCHANGED));
std::string implib;
- if(this->GeneratorTarget->GetImplibGNUtoMS(targetFullPathImport, implib))
+ if(this->Target->GetImplibGNUtoMS(targetFullPathImport, implib))
{
exeCleanFiles.push_back(this->Convert(implib,
cmLocalGenerator::START_OUTPUT,
@@ -361,7 +361,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
vars.CMTarget = this->Target;
vars.Language = linkLanguage.c_str();
vars.Objects = buildObjs.c_str();
- std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
+ std::string objectDir = this->Target->GetSupportDirectory();
objectDir = this->Convert(objectDir,
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::SHELL);
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 8b60a23..3b3f63e 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -410,7 +410,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::UNCHANGED));
std::string implib;
- if(this->GeneratorTarget->GetImplibGNUtoMS(targetFullPathImport, implib))
+ if(this->Target->GetImplibGNUtoMS(targetFullPathImport, implib))
{
libCleanFiles.push_back(this->Convert(implib,
cmLocalGenerator::START_OUTPUT,
@@ -572,7 +572,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
if(this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
{
std::string name_of_def_file =
- this->GeneratorTarget->GetSupportDirectory();
+ this->Target->GetSupportDirectory();
name_of_def_file += std::string("/") +
this->Target->GetName();
name_of_def_file += ".def";
@@ -643,7 +643,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
vars.CMTarget = this->Target;
vars.Language = linkLanguage.c_str();
vars.Objects = buildObjs.c_str();
- std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
+ std::string objectDir = this->Target->GetSupportDirectory();
objectDir = this->Convert(objectDir,
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::SHELL);
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 0ce13c3..6eafeae 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -557,8 +557,7 @@ cmMakefileTargetGenerator
this->GeneratorTarget->GetCompilePDBPath(this->ConfigName);
if(targetFullPathCompilePDB.empty())
{
- targetFullPathCompilePDB =
- this->GeneratorTarget->GetSupportDirectory() + "/";
+ targetFullPathCompilePDB = this->Target->GetSupportDirectory() + "/";
}
}
@@ -595,7 +594,7 @@ cmMakefileTargetGenerator
cmLocalGenerator::NONE,
cmLocalGenerator::SHELL);
vars.Object = shellObj.c_str();
- std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
+ std::string objectDir = this->Target->GetSupportDirectory();
objectDir = this->Convert(objectDir,
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::SHELL);
@@ -1517,7 +1516,7 @@ std::string cmMakefileTargetGenerator::GetLinkRule(
const std::string& linkRuleVar)
{
std::string linkRule = this->Makefile->GetRequiredDefinition(linkRuleVar);
- if(this->GeneratorTarget->HasImplibGNUtoMS())
+ if(this->Target->HasImplibGNUtoMS())
{
std::string ruleVar = "CMAKE_";
ruleVar += this->GeneratorTarget->GetLinkerLanguage(this->ConfigName);
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 0dc53f3..f8743d9 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -492,8 +492,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
{
if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
{
+ std::string dllname = targetOutput;
std::string name_of_def_file
- = gt.GetSupportDirectory();
+ = target.GetSupportDirectory();
name_of_def_file += "/" + target.GetName();
name_of_def_file += ".def ";
vars["LINK_FLAGS"] += " /DEF:";
@@ -558,7 +559,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
cmLocalGenerator::SHELL);
vars["TARGET_IMPLIB"] = impLibPath;
EnsureParentDirectoryExists(impLibPath);
- if(genTarget.HasImportLibrary())
+ if(target.HasImportLibrary())
{
byproducts.push_back(targetOutputImplib);
}
@@ -581,7 +582,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
vars["TARGET_PDB"] = base + suffix + dbg_suffix;
}
- const std::string objPath = GetGeneratorTarget()->GetSupportDirectory();
+ const std::string objPath = GetTarget()->GetSupportDirectory();
vars["OBJECT_DIR"] =
this->GetLocalGenerator()->ConvertToOutputFormat(
this->ConvertToNinjaPath(objPath), cmLocalGenerator::SHELL);
@@ -633,7 +634,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
this->GetLocalGenerator()->ConvertToOutputFormat(
cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
std::string name_of_def_file
- = gt.GetSupportDirectory();
+ = target.GetSupportDirectory();
name_of_def_file += "/" + target.GetName();
name_of_def_file += ".def";
std::string cmd = cmakeCommand;
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index db7cd7d..c2daa63 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -299,7 +299,7 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
this->GeneratorTarget->GetCompilePDBPath(this->GetConfigName());
if(compilePdbPath.empty())
{
- compilePdbPath = this->GeneratorTarget->GetSupportDirectory() + "/";
+ compilePdbPath = this->Target->GetSupportDirectory() + "/";
}
}
@@ -568,7 +568,7 @@ cmNinjaTargetGenerator
std::string const language = source->GetLanguage();
std::string const sourceFileName =
language=="RC" ? source->GetFullPath() : this->GetSourceFilePath(source);
- std::string const objectDir = this->GeneratorTarget->GetSupportDirectory();
+ std::string const objectDir = this->Target->GetSupportDirectory();
std::string const objectFileName = this->GetObjectFilePath(source);
std::string const objectFileDir =
cmSystemTools::GetFilenamePath(objectFileName);
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 6e3f65f..378f132 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -64,7 +64,7 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
std::string basename = cmsys::SystemTools::
GetFilenameWithoutLastExtension(absFile);
- std::string rcc_output_dir = target->GetSupportDirectory();
+ std::string rcc_output_dir = target->Target->GetSupportDirectory();
cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
std::string rcc_output_file = rcc_output_dir;
rcc_output_file += "/qrc_" + basename + ".cpp";
@@ -833,7 +833,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
std::string basename = cmsys::SystemTools::
GetFilenameWithoutLastExtension(absFile);
- std::string rcc_output_dir = target->GetSupportDirectory();
+ std::string rcc_output_dir = target->Target->GetSupportDirectory();
cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
std::string rcc_output_file = rcc_output_dir;
rcc_output_file += "/qrc_" + basename + ".cpp";
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 56bf1e9..31a9aa7 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -382,6 +382,21 @@ cmListFileBacktrace const& cmTarget::GetBacktrace() const
}
//----------------------------------------------------------------------------
+std::string cmTarget::GetSupportDirectory() const
+{
+ std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+ dir += cmake::GetCMakeFilesDirectory();
+ dir += "/";
+ dir += this->Name;
+#if defined(__VMS)
+ dir += "_dir";
+#else
+ dir += ".dir";
+#endif
+ return dir;
+}
+
+//----------------------------------------------------------------------------
bool cmTarget::IsExecutableWithExports() const
{
return (this->GetType() == cmTarget::EXECUTABLE &&
@@ -2184,6 +2199,26 @@ void cmTarget::ComputeVersionedName(std::string& vName,
}
//----------------------------------------------------------------------------
+bool cmTarget::HasImplibGNUtoMS() const
+{
+ return this->HasImportLibrary() && this->GetPropertyAsBool("GNUtoMS");
+}
+
+//----------------------------------------------------------------------------
+bool cmTarget::GetImplibGNUtoMS(std::string const& gnuName,
+ std::string& out, const char* newExt) const
+{
+ if(this->HasImplibGNUtoMS() &&
+ gnuName.size() > 6 && gnuName.substr(gnuName.size()-6) == ".dll.a")
+ {
+ out = gnuName.substr(0, gnuName.size()-6);
+ out += newExt? newExt : ".lib";
+ return true;
+ }
+ return false;
+}
+
+//----------------------------------------------------------------------------
void cmTarget::SetPropertyDefault(const std::string& property,
const char* default_value)
{
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index c159cb2..0c1bbd2 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -242,6 +242,14 @@ public:
void
GetTargetVersion(bool soversion, int& major, int& minor, int& patch) const;
+ /** Does this target have a GNU implib to convert to MS format? */
+ bool HasImplibGNUtoMS() const;
+
+ /** Convert the given GNU import library name (.dll.a) to a name with a new
+ extension (.lib or ${CMAKE_IMPORT_LIBRARY_SUFFIX}). */
+ bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
+ const char* newExt = 0) const;
+
// Get the properties
cmPropertyMap &GetProperties() const { return this->Properties; }
@@ -264,6 +272,9 @@ public:
/** Return whether or not the target is for a DLL platform. */
bool IsDLLPlatform() const { return this->DLLPlatform; }
+ /** Return whether or not the target has a DLL import library. */
+ bool HasImportLibrary() const;
+
/** Return whether this target is a shared library Framework on
Apple. */
bool IsFrameworkOnApple() const;
@@ -284,6 +295,9 @@ public:
/** Get a backtrace from the creation of the target. */
cmListFileBacktrace const& GetBacktrace() const;
+ /** Get a build-tree directory in which to place target support files. */
+ std::string GetSupportDirectory() const;
+
/** @return whether this target have a well defined output file name. */
bool HaveWellDefinedOutputFiles() const;
@@ -459,9 +473,6 @@ private:
void MaybeInvalidatePropertyCache(const std::string& prop);
- /** Return whether or not the target has a DLL import library. */
- bool HasImportLibrary() const;
-
// Internal representation details.
friend class cmTargetInternals;
friend class cmGeneratorTarget;
-----------------------------------------------------------------------
Summary of changes:
Source/cmCommonTargetGenerator.cxx | 4 +-
Source/cmComputeLinkDepends.cxx | 25 +++--
Source/cmComputeLinkDepends.h | 4 +-
Source/cmComputeTargetDepends.cxx | 24 +++--
Source/cmExportBuildFileGenerator.cxx | 2 +-
Source/cmExtraSublimeTextGenerator.cxx | 17 ++--
Source/cmExtraSublimeTextGenerator.h | 3 +-
Source/cmGeneratorExpressionNode.cxx | 20 ++--
Source/cmGeneratorTarget.cxx | 118 +++++++-----------------
Source/cmGeneratorTarget.h | 20 +---
Source/cmGlobalGenerator.cxx | 13 +--
Source/cmGlobalGenerator.h | 2 +-
Source/cmInstallTargetGenerator.cxx | 8 +-
Source/cmLinkItem.h | 7 +-
Source/cmMakefileExecutableTargetGenerator.cxx | 4 +-
Source/cmMakefileLibraryTargetGenerator.cxx | 6 +-
Source/cmMakefileTargetGenerator.cxx | 7 +-
Source/cmNinjaNormalTargetGenerator.cxx | 9 +-
Source/cmNinjaTargetGenerator.cxx | 4 +-
Source/cmQtAutoGeneratorInitializer.cxx | 4 +-
Source/cmTarget.cxx | 35 +++++++
Source/cmTarget.h | 17 +++-
22 files changed, 172 insertions(+), 181 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list