[Cmake-commits] CMake branch, next, updated. v2.8.12-4689-g998b921
Stephen Kelly
steveire at gmail.com
Thu Oct 31 09:53:22 EDT 2013
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 998b921be6c795a9a48ecb02ccffe98193066505 (commit)
via 30bd7d90d3199916fcb9b20d589be55607d62d16 (commit)
from f87f117cdea2b8df77d3496ce207489877cae548 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=998b921be6c795a9a48ecb02ccffe98193066505
commit 998b921be6c795a9a48ecb02ccffe98193066505
Merge: f87f117 30bd7d9
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 31 09:53:15 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 31 09:53:15 2013 -0400
Merge topic 'constify' into next
30bd7d9 Revert "cmTarget: Make GetProperty() const."
diff --cc Source/cmGeneratorExpressionEvaluator.cxx
index aadfc1c,f92c18e..6c97c44
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@@ -907,10 -908,13 +907,9 @@@ static const struct TargetPropertyNode
{
interfacePropertyName = "INTERFACE_COMPILE_DEFINITIONS";
}
- else if (propertyName == "INTERFACE_COMPILE_OPTIONS"
- || propertyName == "COMPILE_OPTIONS")
- {
- interfacePropertyName = "INTERFACE_COMPILE_OPTIONS";
- }
+#undef POPULATE_INTERFACE_PROPERTY_NAME
- const cmTarget* headTarget = context->HeadTarget
- ? context->HeadTarget : target;
+ cmTarget *headTarget = context->HeadTarget ? context->HeadTarget : target;
const char * const *transBegin =
cmArrayBegin(targetPropertyTransitiveWhitelist) + 1;
diff --cc Source/cmTarget.h
index 0f14653,41af8ab..be425e8
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@@ -34,14 -34,11 +34,13 @@@ class cmGlobalGenerator
class cmComputeLinkInformation;
class cmListFileBacktrace;
class cmTarget;
+class cmGeneratorTarget;
+class cmTargetTraceDependencies;
struct cmTargetLinkInformationMap:
- public std::map<std::pair<const cmTarget* , std::string>,
- cmComputeLinkInformation*>
+ public std::map<std::pair<cmTarget*, std::string>, cmComputeLinkInformation*>
{
- typedef std::map<std::pair<const cmTarget* , std::string>,
+ typedef std::map<std::pair<cmTarget*, std::string>,
cmComputeLinkInformation*> derived;
cmTargetLinkInformationMap() {}
cmTargetLinkInformationMap(cmTargetLinkInformationMap const& r);
@@@ -524,28 -527,26 +520,28 @@@ public
void GetCompileOptions(std::vector<std::string> &result,
const char *config);
+ void GetCompileFeatures(std::vector<std::string> &result,
+ const char *config);
- bool IsNullImpliedByLinkLibraries(const std::string &p) const;
+ bool IsNullImpliedByLinkLibraries(const std::string &p);
bool IsLinkInterfaceDependentBoolProperty(const std::string &p,
- const char *config) const;
+ const char *config);
bool IsLinkInterfaceDependentStringProperty(const std::string &p,
- const char *config) const;
+ const char *config);
bool IsLinkInterfaceDependentNumberMinProperty(const std::string &p,
- const char *config) const;
+ const char *config);
bool IsLinkInterfaceDependentNumberMaxProperty(const std::string &p,
- const char *config) const;
+ const char *config);
bool GetLinkInterfaceDependentBoolProperty(const std::string &p,
- const char *config) const;
+ const char *config);
const char *GetLinkInterfaceDependentStringProperty(const std::string &p,
- const char *config) const;
+ const char *config);
const char *GetLinkInterfaceDependentNumberMinProperty(const std::string &p,
- const char *config) const;
+ const char *config);
const char *GetLinkInterfaceDependentNumberMaxProperty(const std::string &p,
- const char *config) const;
+ const char *config);
std::string GetDebugGeneratorExpressions(const std::string &value,
cmTarget::LinkLibraryType llt);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30bd7d90d3199916fcb9b20d589be55607d62d16
commit 30bd7d90d3199916fcb9b20d589be55607d62d16
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 31 14:52:44 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 31 14:52:44 2013 +0100
Revert "cmTarget: Make GetProperty() const."
This reverts commit bbc175ae67f677e098d42228273486512dd50fa5.
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 854e86c..a2f3f7d 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -172,8 +172,7 @@ satisfy dependencies.
//----------------------------------------------------------------------------
cmComputeLinkDepends
-::cmComputeLinkDepends(const cmTarget* target, const char* config,
- const cmTarget* head)
+::cmComputeLinkDepends(cmTarget* target, const char* config, cmTarget* head)
{
// Store context information.
this->Target = target;
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index ef014fe..1d5d1b9 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -32,8 +32,7 @@ class cmake;
class cmComputeLinkDepends
{
public:
- cmComputeLinkDepends(const cmTarget* target, const char* config,
- const cmTarget* head);
+ cmComputeLinkDepends(cmTarget* target, const char* config, cmTarget *head);
~cmComputeLinkDepends();
// Basic information about each link item.
@@ -59,8 +58,8 @@ public:
private:
// Context information.
- const cmTarget* Target;
- const cmTarget* HeadTarget;
+ cmTarget* Target;
+ cmTarget* HeadTarget;
cmMakefile* Makefile;
cmLocalGenerator* LocalGenerator;
cmGlobalGenerator* GlobalGenerator;
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 75be585..d3b28ed 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -239,8 +239,8 @@ because this need be done only for shared libraries without soname-s.
//----------------------------------------------------------------------------
cmComputeLinkInformation
-::cmComputeLinkInformation(const cmTarget* target, const char* config,
- const cmTarget* headTarget)
+::cmComputeLinkInformation(cmTarget* target, const char* config,
+ cmTarget *headTarget)
{
// Store context information.
this->Target = target;
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index 42b470b..e6ee871 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -29,8 +29,8 @@ class cmOrderDirectories;
class cmComputeLinkInformation
{
public:
- cmComputeLinkInformation(const cmTarget* target, const char* config,
- const cmTarget* headTarget);
+ cmComputeLinkInformation(cmTarget* target, const char* config,
+ cmTarget* headTarget);
~cmComputeLinkInformation();
bool Compute();
@@ -74,8 +74,8 @@ private:
std::set<cmTarget*> SharedLibrariesLinked;
// Context information.
- const cmTarget* Target;
- const cmTarget* HeadTarget;
+ cmTarget* Target;
+ cmTarget* HeadTarget;
cmMakefile* Makefile;
cmLocalGenerator* LocalGenerator;
cmGlobalGenerator* GlobalGenerator;
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index edc6481..0ac969b 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -34,7 +34,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
std::string outputVariable;
std::string copyFile;
std::string copyFileError;
- std::vector<const cmTarget*> targets;
+ std::vector<cmTarget*> targets;
std::string libsToLink = " ";
bool useOldLinkLibs = true;
char targetNameBuf[64];
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 52f830d..65f1cc6 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -463,7 +463,7 @@ void cmExportFileGenerator::PopulateCompatibleInterfaceProperties(
}
//----------------------------------------------------------------------------
-void cmExportFileGenerator::GenerateInterfaceProperties(const cmTarget* target,
+void cmExportFileGenerator::GenerateInterfaceProperties(cmTarget *target,
std::ostream& os,
const ImportPropertyMap &properties)
{
@@ -885,7 +885,7 @@ void cmExportFileGenerator::GenerateExpectedTargetsCode(std::ostream& os,
//----------------------------------------------------------------------------
void
cmExportFileGenerator
-::GenerateImportTargetCode(std::ostream& os, const cmTarget* target)
+::GenerateImportTargetCode(std::ostream& os, cmTarget* target)
{
// Construct the imported target name.
std::string targetName = this->Namespace;
@@ -951,7 +951,7 @@ cmExportFileGenerator
void
cmExportFileGenerator
::GenerateImportPropertyCode(std::ostream& os, const char* config,
- const cmTarget* target,
+ cmTarget* target,
ImportPropertyMap const& properties)
{
// Construct the imported target name.
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index bc97b9b..f3d0807 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -60,9 +60,9 @@ protected:
void GenerateImportHeaderCode(std::ostream& os, const char* config = 0);
void GenerateImportFooterCode(std::ostream& os);
void GenerateImportVersionCode(std::ostream& os);
- void GenerateImportTargetCode(std::ostream& os, const cmTarget* target);
+ void GenerateImportTargetCode(std::ostream& os, cmTarget* target);
void GenerateImportPropertyCode(std::ostream& os, const char* config,
- const cmTarget* target,
+ cmTarget* target,
ImportPropertyMap const& properties);
void GenerateImportedFileChecksCode(std::ostream& os, cmTarget* target,
ImportPropertyMap const& properties,
@@ -115,7 +115,7 @@ protected:
ImportPropertyMap &properties);
void PopulateCompatibleInterfaceProperties(cmTarget *target,
ImportPropertyMap &properties);
- void GenerateInterfaceProperties(const cmTarget* target, std::ostream& os,
+ void GenerateInterfaceProperties(cmTarget *target, std::ostream& os,
const ImportPropertyMap &properties);
void PopulateIncludeDirectoriesInterface(
cmTargetExport *target,
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index b3e4a45..819ac37 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -18,11 +18,11 @@
//----------------------------------------------------------------------------
bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
{
- std::set<const cmTarget*> emitted;
- std::set<const cmTarget*> emittedDeps;
+ std::set<cmTarget*> emitted;
+ std::set<cmTarget*> emittedDeps;
while(!this->Exports.empty())
{
- const cmTarget* te = this->Exports.back();
+ cmTarget* te = this->Exports.back();
this->Exports.pop_back();
if (emitted.insert(te).second)
{
@@ -45,8 +45,8 @@ bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
}
std::string cmExportTryCompileFileGenerator::FindTargets(const char *propName,
- const cmTarget* tgt,
- std::set<const cmTarget*> &emitted)
+ cmTarget *tgt,
+ std::set<cmTarget*> &emitted)
{
const char *prop = tgt->GetProperty(propName);
if(!prop)
@@ -70,8 +70,8 @@ std::string cmExportTryCompileFileGenerator::FindTargets(const char *propName,
std::string result = cge->Evaluate(tgt->GetMakefile(), this->Config,
false, &dummyHead, tgt, &dagChecker);
- const std::set<const cmTarget*> &allTargets = cge->GetAllTargetsSeen();
- for(std::set<const cmTarget*>::const_iterator li = allTargets.begin();
+ const std::set<cmTarget*> &allTargets = cge->GetAllTargetsSeen();
+ for(std::set<cmTarget*>::const_iterator li = allTargets.begin();
li != allTargets.end(); ++li)
{
if(emitted.insert(*li).second)
@@ -84,9 +84,9 @@ std::string cmExportTryCompileFileGenerator::FindTargets(const char *propName,
//----------------------------------------------------------------------------
void
-cmExportTryCompileFileGenerator::PopulateProperties(const cmTarget* target,
+cmExportTryCompileFileGenerator::PopulateProperties(cmTarget* target,
ImportPropertyMap& properties,
- std::set<const cmTarget*> &emitted)
+ std::set<cmTarget*> &emitted)
{
cmPropertyMap props = target->GetProperties();
for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h
index ef69b07..91b4a61 100644
--- a/Source/cmExportTryCompileFileGenerator.h
+++ b/Source/cmExportTryCompileFileGenerator.h
@@ -21,7 +21,7 @@ class cmExportTryCompileFileGenerator: public cmExportFileGenerator
{
public:
/** Set the list of targets to export. */
- void SetExports(const std::vector<const cmTarget*> &exports)
+ void SetExports(const std::vector<cmTarget*> &exports)
{ this->Exports = exports; }
void SetConfig(const char *config) { this->Config = config; }
protected:
@@ -39,18 +39,18 @@ protected:
cmTarget*,
cmTarget*) {}
- void PopulateProperties(const cmTarget* target,
+ void PopulateProperties(cmTarget* target,
ImportPropertyMap& properties,
- std::set<const cmTarget*> &emitted);
+ std::set<cmTarget*> &emitted);
std::string InstallNameDir(cmTarget* target,
const std::string& config);
private:
- std::string FindTargets(const char *prop, const cmTarget* tgt,
- std::set<const cmTarget*> &emitted);
+ std::string FindTargets(const char *prop, cmTarget *tgt,
+ std::set<cmTarget*> &emitted);
- std::vector<const cmTarget*> Exports;
+ std::vector<cmTarget*> Exports;
const char *Config;
};
diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx
index 97a20ce..7beeda0 100644
--- a/Source/cmFindCommon.cxx
+++ b/Source/cmFindCommon.cxx
@@ -140,25 +140,14 @@ void cmFindCommon::RerootPaths(std::vector<std::string>& paths)
}
const char* rootPath =
this->Makefile->GetDefinition("CMAKE_FIND_ROOT_PATH");
- const char* osxRootPath =
- this->Makefile->GetDefinition("_CMAKE_OSX_SYSROOT_PATH");
- const bool noRootPath = !rootPath || !*rootPath;
- const bool noOSXRootPath = !osxRootPath || !*osxRootPath;
- if(noRootPath && noOSXRootPath)
+ if((rootPath == 0) || (strlen(rootPath) == 0))
{
return;
}
// Construct the list of path roots with no trailing slashes.
std::vector<std::string> roots;
- if(rootPath)
- {
- cmSystemTools::ExpandListArgument(rootPath, roots);
- }
- if(osxRootPath)
- {
- roots.push_back(osxRootPath);
- }
+ cmSystemTools::ExpandListArgument(rootPath, roots);
for(std::vector<std::string>::iterator ri = roots.begin();
ri != roots.end(); ++ri)
{
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index e1543be..97853f3 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -53,7 +53,7 @@ cmGeneratorExpression::~cmGeneratorExpression()
//----------------------------------------------------------------------------
const char *cmCompiledGeneratorExpression::Evaluate(
cmMakefile* mf, const char* config, bool quiet,
- const cmTarget* headTarget,
+ cmTarget *headTarget,
cmGeneratorExpressionDAGChecker *dagChecker) const
{
return this->Evaluate(mf,
@@ -67,8 +67,8 @@ const char *cmCompiledGeneratorExpression::Evaluate(
//----------------------------------------------------------------------------
const char *cmCompiledGeneratorExpression::Evaluate(
cmMakefile* mf, const char* config, bool quiet,
- const cmTarget* headTarget,
- const cmTarget* currentTarget,
+ cmTarget *headTarget,
+ cmTarget *currentTarget,
cmGeneratorExpressionDAGChecker *dagChecker) const
{
if (!this->NeedsEvaluation)
diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h
index 443dfcb..bc0f6c2 100644
--- a/Source/cmGeneratorExpression.h
+++ b/Source/cmGeneratorExpression.h
@@ -80,12 +80,12 @@ class cmCompiledGeneratorExpression
public:
const char* Evaluate(cmMakefile* mf, const char* config,
bool quiet = false,
- const cmTarget* headTarget = 0,
- const cmTarget* currentTarget = 0,
+ cmTarget *headTarget = 0,
+ cmTarget *currentTarget = 0,
cmGeneratorExpressionDAGChecker *dagChecker = 0) const;
const char* Evaluate(cmMakefile* mf, const char* config,
bool quiet,
- const cmTarget* headTarget,
+ cmTarget *headTarget,
cmGeneratorExpressionDAGChecker *dagChecker) const;
/** Get set of targets found during evaluations. */
@@ -95,7 +95,7 @@ public:
std::set<cmStdString> const& GetSeenTargetProperties() const
{ return this->SeenTargetProperties; }
- std::set<const cmTarget*> const& GetAllTargetsSeen() const
+ std::set<cmTarget*> const& GetAllTargetsSeen() const
{ return this->AllTargetsSeen; }
~cmCompiledGeneratorExpression();
@@ -129,7 +129,7 @@ private:
bool NeedsEvaluation;
mutable std::set<cmTarget*> DependTargets;
- mutable std::set<const cmTarget*> AllTargetsSeen;
+ mutable std::set<cmTarget*> AllTargetsSeen;
mutable std::set<cmStdString> SeenTargetProperties;
mutable std::string Output;
mutable bool HadContextSensitiveCondition;
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 0658fc8..f92c18e 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -661,8 +661,8 @@ static const char* targetPropertyTransitiveWhitelist[] = {
};
std::string getLinkedTargetsContent(const std::vector<std::string> &libraries,
- const cmTarget* target,
- const cmTarget* headTarget,
+ cmTarget *target,
+ cmTarget *headTarget,
cmGeneratorExpressionContext *context,
cmGeneratorExpressionDAGChecker *dagChecker,
const std::string &interfacePropertyName)
@@ -726,7 +726,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
cmsys::RegularExpression propertyNameValidator;
propertyNameValidator.compile("^[A-Za-z0-9_]+$");
- const cmTarget* target = context->HeadTarget;
+ cmTarget* target = context->HeadTarget;
std::string propertyName = *parameters.begin();
if (!target && parameters.size() == 1)
@@ -914,8 +914,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
interfacePropertyName = "INTERFACE_COMPILE_OPTIONS";
}
- const cmTarget* headTarget = context->HeadTarget
- ? context->HeadTarget : target;
+ cmTarget *headTarget = context->HeadTarget ? context->HeadTarget : target;
const char * const *transBegin =
cmArrayBegin(targetPropertyTransitiveWhitelist) + 1;
@@ -1092,8 +1091,7 @@ static const char* targetPolicyWhitelist[] = {
#undef TARGET_POLICY_STRING
};
-cmPolicies::PolicyStatus statusForTarget(const cmTarget* tgt,
- const char *policy)
+cmPolicies::PolicyStatus statusForTarget(cmTarget *tgt, const char *policy)
{
#define RETURN_POLICY(POLICY) \
if (strcmp(policy, #POLICY) == 0) \
diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h
index 8a788ca..343e18b 100644
--- a/Source/cmGeneratorExpressionEvaluator.h
+++ b/Source/cmGeneratorExpressionEvaluator.h
@@ -24,13 +24,13 @@ struct cmGeneratorExpressionContext
{
cmListFileBacktrace Backtrace;
std::set<cmTarget*> DependTargets;
- std::set<const cmTarget*> AllTargets;
+ std::set<cmTarget*> AllTargets;
std::set<cmStdString> SeenTargetProperties;
cmMakefile *Makefile;
const char *Config;
- const cmTarget* HeadTarget; // The target whose property is being evaluated.
- const cmTarget* CurrentTarget; // The dependent of HeadTarget which appears
- // directly or indirectly in the property.
+ cmTarget *HeadTarget; // The target whose property is being evaluated.
+ cmTarget *CurrentTarget; // The dependent of HeadTarget which appears
+ // directly or indirectly in the property.
bool Quiet;
bool HadError;
bool HadContextSensitiveCondition;
diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx
index bf15ab7..0220825 100644
--- a/Source/cmOrderDirectories.cxx
+++ b/Source/cmOrderDirectories.cxx
@@ -273,7 +273,7 @@ bool cmOrderDirectoriesConstraintLibrary::FindConflict(std::string const& dir)
//----------------------------------------------------------------------------
cmOrderDirectories::cmOrderDirectories(cmGlobalGenerator* gg,
- const cmTarget* target,
+ cmTarget* target,
const char* purpose)
{
this->GlobalGenerator = gg;
diff --git a/Source/cmOrderDirectories.h b/Source/cmOrderDirectories.h
index 9a0fe1b..96a75de 100644
--- a/Source/cmOrderDirectories.h
+++ b/Source/cmOrderDirectories.h
@@ -27,7 +27,7 @@ class cmTarget;
class cmOrderDirectories
{
public:
- cmOrderDirectories(cmGlobalGenerator* gg, const cmTarget* target,
+ cmOrderDirectories(cmGlobalGenerator* gg, cmTarget* target,
const char* purpose);
~cmOrderDirectories();
void AddRuntimeLibrary(std::string const& fullPath, const char* soname = 0);
@@ -41,7 +41,7 @@ public:
std::vector<std::string> const& GetOrderedDirectories();
private:
cmGlobalGenerator* GlobalGenerator;
- const cmTarget* Target;
+ cmTarget* Target;
std::string Purpose;
bool Computed;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 7cbb4b7..85ee6d2 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -71,9 +71,9 @@ struct cmTarget::ImportInfo
cmTarget::LinkInterface LinkInterface;
};
-struct TargetConfigPair : public std::pair<const cmTarget* , std::string> {
- TargetConfigPair(const cmTarget* tgt, const std::string &config)
- : std::pair<const cmTarget* , std::string>(tgt, config) {}
+struct TargetConfigPair : public std::pair<cmTarget*, std::string> {
+ TargetConfigPair(cmTarget* tgt, const std::string &config)
+ : std::pair<cmTarget*, std::string>(tgt, config) {}
};
//----------------------------------------------------------------------------
@@ -436,7 +436,7 @@ std::string cmTarget::GetSupportDirectory() const
}
//----------------------------------------------------------------------------
-bool cmTarget::IsExecutableWithExports() const
+bool cmTarget::IsExecutableWithExports()
{
return (this->GetType() == cmTarget::EXECUTABLE &&
this->GetPropertyAsBool("ENABLE_EXPORTS"));
@@ -454,7 +454,7 @@ bool cmTarget::IsLinkable()
}
//----------------------------------------------------------------------------
-bool cmTarget::HasImportLibrary() const
+bool cmTarget::HasImportLibrary()
{
return (this->DLLPlatform &&
(this->GetType() == cmTarget::SHARED_LIBRARY ||
@@ -462,7 +462,7 @@ bool cmTarget::HasImportLibrary() const
}
//----------------------------------------------------------------------------
-bool cmTarget::IsFrameworkOnApple() const
+bool cmTarget::IsFrameworkOnApple()
{
return (this->GetType() == cmTarget::SHARED_LIBRARY &&
this->Makefile->IsOn("APPLE") &&
@@ -470,7 +470,7 @@ bool cmTarget::IsFrameworkOnApple() const
}
//----------------------------------------------------------------------------
-bool cmTarget::IsAppBundleOnApple() const
+bool cmTarget::IsAppBundleOnApple()
{
return (this->GetType() == cmTarget::EXECUTABLE &&
this->Makefile->IsOn("APPLE") &&
@@ -478,7 +478,7 @@ bool cmTarget::IsAppBundleOnApple() const
}
//----------------------------------------------------------------------------
-bool cmTarget::IsCFBundleOnApple() const
+bool cmTarget::IsCFBundleOnApple()
{
return (this->GetType() == cmTarget::MODULE_LIBRARY &&
this->Makefile->IsOn("APPLE") &&
@@ -486,7 +486,7 @@ bool cmTarget::IsCFBundleOnApple() const
}
//----------------------------------------------------------------------------
-bool cmTarget::IsBundleOnApple() const
+bool cmTarget::IsBundleOnApple()
{
return this->IsFrameworkOnApple() || this->IsAppBundleOnApple() ||
this->IsCFBundleOnApple();
@@ -1019,13 +1019,13 @@ void cmTarget::AddLinkDirectory(const char* d)
}
//----------------------------------------------------------------------------
-const std::vector<std::string>& cmTarget::GetLinkDirectories() const
+const std::vector<std::string>& cmTarget::GetLinkDirectories()
{
return this->LinkDirectories;
}
//----------------------------------------------------------------------------
-cmTarget::LinkLibraryType cmTarget::ComputeLinkType(const char* config) const
+cmTarget::LinkLibraryType cmTarget::ComputeLinkType(const char* config)
{
// No configuration is always optimized.
if(!(config && *config))
@@ -1089,8 +1089,7 @@ bool cmTarget::NameResolvesToFramework(const std::string& libname)
//----------------------------------------------------------------------------
void cmTarget::GetDirectLinkLibraries(const char *config,
- std::vector<std::string> &libs,
- const cmTarget* head) const
+ std::vector<std::string> &libs, cmTarget *head)
{
const char *prop = this->GetProperty("LINK_LIBRARIES");
if (prop)
@@ -1817,7 +1816,7 @@ void cmTarget::AppendProperty(const char* prop, const char* value,
}
//----------------------------------------------------------------------------
-const char* cmTarget::GetExportName() const
+const char* cmTarget::GetExportName()
{
const char *exportName = this->GetProperty("EXPORT_NAME");
@@ -2627,7 +2626,7 @@ void cmTarget::MarkAsImported()
}
//----------------------------------------------------------------------------
-bool cmTarget::HaveWellDefinedOutputFiles() const
+bool cmTarget::HaveWellDefinedOutputFiles()
{
return
this->GetType() == cmTarget::STATIC_LIBRARY ||
@@ -2637,7 +2636,7 @@ bool cmTarget::HaveWellDefinedOutputFiles() const
}
//----------------------------------------------------------------------------
-cmTarget::OutputInfo const* cmTarget::GetOutputInfo(const char* config) const
+cmTarget::OutputInfo const* cmTarget::GetOutputInfo(const char* config)
{
// There is no output information for imported targets.
if(this->IsImported())
@@ -2682,7 +2681,7 @@ cmTarget::OutputInfo const* cmTarget::GetOutputInfo(const char* config) const
}
//----------------------------------------------------------------------------
-std::string cmTarget::GetDirectory(const char* config, bool implib) const
+std::string cmTarget::GetDirectory(const char* config, bool implib)
{
if (this->IsImported())
{
@@ -2711,7 +2710,7 @@ std::string cmTarget::GetPDBDirectory(const char* config)
}
//----------------------------------------------------------------------------
-const char* cmTarget::GetLocation(const char* config) const
+const char* cmTarget::GetLocation(const char* config)
{
if (this->IsImported())
{
@@ -2724,7 +2723,7 @@ const char* cmTarget::GetLocation(const char* config) const
}
//----------------------------------------------------------------------------
-const char* cmTarget::ImportedGetLocation(const char* config) const
+const char* cmTarget::ImportedGetLocation(const char* config)
{
static std::string location;
location = this->ImportedGetFullPath(config, false);
@@ -2732,7 +2731,7 @@ const char* cmTarget::ImportedGetLocation(const char* config) const
}
//----------------------------------------------------------------------------
-const char* cmTarget::NormalGetLocation(const char* config) const
+const char* cmTarget::NormalGetLocation(const char* config)
{
static std::string location;
// Handle the configuration-specific case first.
@@ -2827,13 +2826,13 @@ const char* cmTarget::GetFeature(const char* feature, const char* config)
}
//----------------------------------------------------------------------------
-const char *cmTarget::GetProperty(const char* prop) const
+const char *cmTarget::GetProperty(const char* prop)
{
return this->GetProperty(prop, cmProperty::TARGET);
}
//----------------------------------------------------------------------------
-bool cmTarget::HandleLocationPropertyPolicy() const
+bool cmTarget::HandleLocationPropertyPolicy()
{
if (this->IsImported())
{
@@ -2871,7 +2870,7 @@ bool cmTarget::HandleLocationPropertyPolicy() const
//----------------------------------------------------------------------------
const char *cmTarget::GetProperty(const char* prop,
- cmProperty::ScopeType scope) const
+ cmProperty::ScopeType scope)
{
if(!prop)
{
@@ -3064,7 +3063,7 @@ const char *cmTarget::GetProperty(const char* prop,
}
//----------------------------------------------------------------------------
-bool cmTarget::GetPropertyAsBool(const char* prop) const
+bool cmTarget::GetPropertyAsBool(const char* prop)
{
return cmSystemTools::IsOn(this->GetProperty(prop));
}
@@ -3073,13 +3072,13 @@ bool cmTarget::GetPropertyAsBool(const char* prop) const
class cmTargetCollectLinkLanguages
{
public:
- cmTargetCollectLinkLanguages(const cmTarget* target, const char* config,
+ cmTargetCollectLinkLanguages(cmTarget* target, const char* config,
std::set<cmStdString>& languages,
- const cmTarget* head):
+ cmTarget* head):
Config(config), Languages(languages), HeadTarget(head)
{ this->Visited.insert(target); }
- void Visit(const cmTarget* target)
+ void Visit(cmTarget* target)
{
if(!target || !this->Visited.insert(target).second)
{
@@ -3106,15 +3105,14 @@ public:
private:
const char* Config;
std::set<cmStdString>& Languages;
- const cmTarget* HeadTarget;
- std::set<const cmTarget*> Visited;
+ cmTarget* HeadTarget;
+ std::set<cmTarget*> Visited;
};
//----------------------------------------------------------------------------
-const char* cmTarget::GetLinkerLanguage(const char* config,
- const cmTarget* head) const
+const char* cmTarget::GetLinkerLanguage(const char* config, cmTarget *head)
{
- const cmTarget* headTarget = head ? head : this;
+ cmTarget *headTarget = head ? head : this;
const char* lang = this->GetLinkClosure(config, headTarget)
->LinkerLanguage.c_str();
return *lang? lang : 0;
@@ -3122,7 +3120,7 @@ const char* cmTarget::GetLinkerLanguage(const char* config,
//----------------------------------------------------------------------------
cmTarget::LinkClosure const* cmTarget::GetLinkClosure(const char* config,
- const cmTarget* head) const
+ cmTarget *head)
{
TargetConfigPair key(head, cmSystemTools::UpperCase(config ? config : ""));
cmTargetInternals::LinkClosureMapType::iterator
@@ -3141,12 +3139,12 @@ cmTarget::LinkClosure const* cmTarget::GetLinkClosure(const char* config,
class cmTargetSelectLinker
{
int Preference;
- const cmTarget* Target;
+ cmTarget* Target;
cmMakefile* Makefile;
cmGlobalGenerator* GG;
std::set<cmStdString> Preferred;
public:
- cmTargetSelectLinker(const cmTarget* target): Preference(0), Target(target)
+ cmTargetSelectLinker(cmTarget* target): Preference(0), Target(target)
{
this->Makefile = this->Target->GetMakefile();
this->GG = this->Makefile->GetLocalGenerator()->GetGlobalGenerator();
@@ -3192,7 +3190,7 @@ public:
//----------------------------------------------------------------------------
void cmTarget::ComputeLinkClosure(const char* config, LinkClosure& lc,
- const cmTarget* head) const
+ cmTarget *head)
{
// Get languages built in this target.
std::set<cmStdString> languages;
@@ -3255,7 +3253,7 @@ void cmTarget::ComputeLinkClosure(const char* config, LinkClosure& lc,
}
//----------------------------------------------------------------------------
-const char* cmTarget::GetSuffixVariableInternal(bool implib) const
+const char* cmTarget::GetSuffixVariableInternal(bool implib)
{
switch(this->GetType())
{
@@ -3281,7 +3279,7 @@ const char* cmTarget::GetSuffixVariableInternal(bool implib) const
//----------------------------------------------------------------------------
-const char* cmTarget::GetPrefixVariableInternal(bool implib) const
+const char* cmTarget::GetPrefixVariableInternal(bool implib)
{
switch(this->GetType())
{
@@ -3304,7 +3302,7 @@ const char* cmTarget::GetPrefixVariableInternal(bool implib) const
}
//----------------------------------------------------------------------------
-std::string cmTarget::GetPDBName(const char* config) const
+std::string cmTarget::GetPDBName(const char* config)
{
std::string prefix;
std::string base;
@@ -3336,7 +3334,7 @@ std::string cmTarget::GetPDBName(const char* config) const
}
//----------------------------------------------------------------------------
-bool cmTarget::HasSOName(const char* config) const
+bool cmTarget::HasSOName(const char* config)
{
// soname is supported only for shared libraries and modules,
// and then only when the platform supports an soname flag.
@@ -3348,7 +3346,7 @@ bool cmTarget::HasSOName(const char* config) const
}
//----------------------------------------------------------------------------
-std::string cmTarget::GetSOName(const char* config) const
+std::string cmTarget::GetSOName(const char* config)
{
if(this->IsImported())
{
@@ -3476,7 +3474,7 @@ bool cmTarget::IsImportedSharedLibWithoutSOName(const char* config)
}
//----------------------------------------------------------------------------
-std::string cmTarget::NormalGetRealName(const char* config) const
+std::string cmTarget::NormalGetRealName(const char* config)
{
// This should not be called for imported targets.
// TODO: Split cmTarget into a class hierarchy to get compile-time
@@ -3514,7 +3512,7 @@ std::string cmTarget::NormalGetRealName(const char* config) const
}
//----------------------------------------------------------------------------
-std::string cmTarget::GetFullName(const char* config, bool implib) const
+std::string cmTarget::GetFullName(const char* config, bool implib)
{
if(this->IsImported())
{
@@ -3527,8 +3525,7 @@ std::string cmTarget::GetFullName(const char* config, bool implib) const
}
//----------------------------------------------------------------------------
-std::string
-cmTarget::GetFullNameImported(const char* config, bool implib) const
+std::string cmTarget::GetFullNameImported(const char* config, bool implib)
{
return cmSystemTools::GetFilenameName(
this->ImportedGetFullPath(config, implib));
@@ -3544,7 +3541,7 @@ void cmTarget::GetFullNameComponents(std::string& prefix, std::string& base,
//----------------------------------------------------------------------------
std::string cmTarget::GetFullPath(const char* config, bool implib,
- bool realname) const
+ bool realname)
{
if(this->IsImported())
{
@@ -3558,7 +3555,7 @@ std::string cmTarget::GetFullPath(const char* config, bool implib,
//----------------------------------------------------------------------------
std::string cmTarget::NormalGetFullPath(const char* config, bool implib,
- bool realname) const
+ bool realname)
{
std::string fpath = this->GetDirectory(config, implib);
fpath += "/";
@@ -3585,8 +3582,7 @@ std::string cmTarget::NormalGetFullPath(const char* config, bool implib,
}
//----------------------------------------------------------------------------
-std::string
-cmTarget::ImportedGetFullPath(const char* config, bool implib) const
+std::string cmTarget::ImportedGetFullPath(const char* config, bool implib)
{
std::string result;
if(cmTarget::ImportInfo const* info = this->GetImportInfo(config, this))
@@ -3602,8 +3598,7 @@ cmTarget::ImportedGetFullPath(const char* config, bool implib) const
}
//----------------------------------------------------------------------------
-std::string
-cmTarget::GetFullNameInternal(const char* config, bool implib) const
+std::string cmTarget::GetFullNameInternal(const char* config, bool implib)
{
std::string prefix;
std::string base;
@@ -3617,7 +3612,7 @@ void cmTarget::GetFullNameInternal(const char* config,
bool implib,
std::string& outPrefix,
std::string& outBase,
- std::string& outSuffix) const
+ std::string& outSuffix)
{
// Use just the target name for non-main target types.
if(this->GetType() != cmTarget::STATIC_LIBRARY &&
@@ -3755,7 +3750,7 @@ void cmTarget::GetLibraryNames(std::string& name,
std::string& realName,
std::string& impName,
std::string& pdbName,
- const char* config) const
+ const char* config)
{
// This should not be called for imported targets.
// TODO: Split cmTarget into a class hierarchy to get compile-time
@@ -3841,7 +3836,7 @@ void cmTarget::ComputeVersionedName(std::string& vName,
std::string const& base,
std::string const& suffix,
std::string const& name,
- const char* version) const
+ const char* version)
{
vName = this->IsApple? (prefix+base) : name;
if(version)
@@ -3857,7 +3852,7 @@ void cmTarget::GetExecutableNames(std::string& name,
std::string& realName,
std::string& impName,
std::string& pdbName,
- const char* config) const
+ const char* config)
{
// This should not be called for imported targets.
// TODO: Split cmTarget into a class hierarchy to get compile-time
@@ -3953,7 +3948,7 @@ void cmTarget::SetPropertyDefault(const char* property,
}
//----------------------------------------------------------------------------
-bool cmTarget::HaveBuildTreeRPATH(const char *config) const
+bool cmTarget::HaveBuildTreeRPATH(const char *config)
{
if (this->GetPropertyAsBool("SKIP_BUILD_RPATH"))
{
@@ -3965,7 +3960,7 @@ bool cmTarget::HaveBuildTreeRPATH(const char *config) const
}
//----------------------------------------------------------------------------
-bool cmTarget::HaveInstallTreeRPATH() const
+bool cmTarget::HaveInstallTreeRPATH()
{
const char* install_rpath = this->GetProperty("INSTALL_RPATH");
return (install_rpath && *install_rpath) &&
@@ -4098,7 +4093,7 @@ std::string cmTarget::GetInstallNameDirForInstallTree()
}
//----------------------------------------------------------------------------
-const char* cmTarget::GetOutputTargetType(bool implib) const
+const char* cmTarget::GetOutputTargetType(bool implib)
{
switch(this->GetType())
{
@@ -4155,7 +4150,7 @@ const char* cmTarget::GetOutputTargetType(bool implib) const
//----------------------------------------------------------------------------
bool cmTarget::ComputeOutputDir(const char* config,
- bool implib, std::string& out) const
+ bool implib, std::string& out)
{
bool usesDefaultOutputDir = false;
@@ -4235,7 +4230,7 @@ bool cmTarget::ComputeOutputDir(const char* config,
}
//----------------------------------------------------------------------------
-bool cmTarget::ComputePDBOutputDir(const char* config, std::string& out) const
+bool cmTarget::ComputePDBOutputDir(const char* config, std::string& out)
{
// Look for a target property defining the target output directory
// based on the target type.
@@ -4301,7 +4296,7 @@ bool cmTarget::UsesDefaultOutputDir(const char* config, bool implib)
}
//----------------------------------------------------------------------------
-std::string cmTarget::GetOutputName(const char* config, bool implib) const
+std::string cmTarget::GetOutputName(const char* config, bool implib)
{
std::vector<std::string> props;
std::string type = this->GetOutputTargetType(implib);
@@ -4338,7 +4333,7 @@ std::string cmTarget::GetOutputName(const char* config, bool implib) const
}
//----------------------------------------------------------------------------
-std::string cmTarget::GetFrameworkVersion() const
+std::string cmTarget::GetFrameworkVersion()
{
if(const char* fversion = this->GetProperty("FRAMEWORK_VERSION"))
{
@@ -4381,7 +4376,7 @@ const char* cmTarget::GetExportMacro()
}
//----------------------------------------------------------------------------
-bool cmTarget::IsNullImpliedByLinkLibraries(const std::string &p) const
+bool cmTarget::IsNullImpliedByLinkLibraries(const std::string &p)
{
return this->LinkImplicitNullProperties.find(p)
!= this->LinkImplicitNullProperties.end();
@@ -4389,21 +4384,20 @@ bool cmTarget::IsNullImpliedByLinkLibraries(const std::string &p) const
//----------------------------------------------------------------------------
template<typename PropertyType>
-PropertyType getTypedProperty(const cmTarget* tgt, const char *prop,
+PropertyType getTypedProperty(cmTarget *tgt, const char *prop,
PropertyType *);
//----------------------------------------------------------------------------
template<>
-bool getTypedProperty<bool>(const cmTarget* tgt, const char *prop, bool *)
+bool getTypedProperty<bool>(cmTarget *tgt, const char *prop, bool *)
{
return tgt->GetPropertyAsBool(prop);
}
//----------------------------------------------------------------------------
template<>
-const char *getTypedProperty<const char *>(const cmTarget* tgt,
- const char *prop,
- const char **)
+const char *getTypedProperty<const char *>(cmTarget *tgt, const char *prop,
+ const char **)
{
return tgt->GetProperty(prop);
}
@@ -4513,7 +4507,7 @@ const char* impliedValue<const char*>(const char*)
//----------------------------------------------------------------------------
template<typename PropertyType>
-PropertyType checkInterfacePropertyCompatibility(const cmTarget* tgt,
+PropertyType checkInterfacePropertyCompatibility(cmTarget *tgt,
const std::string &p,
const char *config,
const char *defaultValue,
@@ -4662,7 +4656,7 @@ PropertyType checkInterfacePropertyCompatibility(const cmTarget* tgt,
//----------------------------------------------------------------------------
bool cmTarget::GetLinkInterfaceDependentBoolProperty(const std::string &p,
- const char *config) const
+ const char *config)
{
return checkInterfacePropertyCompatibility<bool>(this, p, config, "FALSE",
BoolType, 0);
@@ -4671,7 +4665,7 @@ bool cmTarget::GetLinkInterfaceDependentBoolProperty(const std::string &p,
//----------------------------------------------------------------------------
const char * cmTarget::GetLinkInterfaceDependentStringProperty(
const std::string &p,
- const char *config) const
+ const char *config)
{
return checkInterfacePropertyCompatibility<const char *>(this,
p,
@@ -4683,7 +4677,7 @@ const char * cmTarget::GetLinkInterfaceDependentStringProperty(
//----------------------------------------------------------------------------
const char * cmTarget::GetLinkInterfaceDependentNumberMinProperty(
const std::string &p,
- const char *config) const
+ const char *config)
{
return checkInterfacePropertyCompatibility<const char *>(this,
p,
@@ -4695,7 +4689,7 @@ const char * cmTarget::GetLinkInterfaceDependentNumberMinProperty(
//----------------------------------------------------------------------------
const char * cmTarget::GetLinkInterfaceDependentNumberMaxProperty(
const std::string &p,
- const char *config) const
+ const char *config)
{
return checkInterfacePropertyCompatibility<const char *>(this,
p,
@@ -4705,7 +4699,7 @@ const char * cmTarget::GetLinkInterfaceDependentNumberMaxProperty(
}
//----------------------------------------------------------------------------
-bool isLinkDependentProperty(const cmTarget* tgt, const std::string &p,
+bool isLinkDependentProperty(cmTarget *tgt, const std::string &p,
const char *interfaceProperty,
const char *config)
{
@@ -4749,7 +4743,7 @@ bool isLinkDependentProperty(const cmTarget* tgt, const std::string &p,
//----------------------------------------------------------------------------
bool cmTarget::IsLinkInterfaceDependentBoolProperty(const std::string &p,
- const char *config) const
+ const char *config)
{
if (this->TargetTypeValue == OBJECT_LIBRARY)
{
@@ -4762,7 +4756,7 @@ bool cmTarget::IsLinkInterfaceDependentBoolProperty(const std::string &p,
//----------------------------------------------------------------------------
bool cmTarget::IsLinkInterfaceDependentStringProperty(const std::string &p,
- const char *config) const
+ const char *config)
{
if (this->TargetTypeValue == OBJECT_LIBRARY)
{
@@ -4774,7 +4768,7 @@ bool cmTarget::IsLinkInterfaceDependentStringProperty(const std::string &p,
//----------------------------------------------------------------------------
bool cmTarget::IsLinkInterfaceDependentNumberMinProperty(const std::string &p,
- const char *config) const
+ const char *config)
{
if (this->TargetTypeValue == OBJECT_LIBRARY)
{
@@ -4786,7 +4780,7 @@ bool cmTarget::IsLinkInterfaceDependentNumberMinProperty(const std::string &p,
//----------------------------------------------------------------------------
bool cmTarget::IsLinkInterfaceDependentNumberMaxProperty(const std::string &p,
- const char *config) const
+ const char *config)
{
if (this->TargetTypeValue == OBJECT_LIBRARY)
{
@@ -4810,7 +4804,7 @@ void cmTarget::GetLanguages(std::set<cmStdString>& languages) const
}
//----------------------------------------------------------------------------
-bool cmTarget::IsChrpathUsed(const char* config) const
+bool cmTarget::IsChrpathUsed(const char* config)
{
// Only certain target types have an rpath.
if(!(this->GetType() == cmTarget::SHARED_LIBRARY ||
@@ -4877,7 +4871,7 @@ bool cmTarget::IsChrpathUsed(const char* config) const
//----------------------------------------------------------------------------
cmTarget::ImportInfo const*
-cmTarget::GetImportInfo(const char* config, const cmTarget* headTarget) const
+cmTarget::GetImportInfo(const char* config, cmTarget *headTarget)
{
// There is no imported information for non-imported targets.
if(!this->IsImported())
@@ -4927,7 +4921,7 @@ cmTarget::GetImportInfo(const char* config, const cmTarget* headTarget) const
bool cmTarget::GetMappedConfig(std::string const& desired_config,
const char** loc,
const char** imp,
- std::string& suffix) const
+ std::string& suffix)
{
// Track the configuration-specific property suffix.
suffix = "_";
@@ -5049,7 +5043,7 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
//----------------------------------------------------------------------------
void cmTarget::ComputeImportInfo(std::string const& desired_config,
ImportInfo& info,
- const cmTarget* headTarget) const
+ cmTarget *headTarget)
{
// This method finds information about an imported target from its
// properties. The "IMPORTED_" namespace is reserved for properties
@@ -5235,7 +5229,7 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
//----------------------------------------------------------------------------
cmTarget::LinkInterface const* cmTarget::GetLinkInterface(const char* config,
- const cmTarget* head) const
+ cmTarget *head)
{
// Imported targets have their own link interface.
if(this->IsImported())
@@ -5277,8 +5271,8 @@ cmTarget::LinkInterface const* cmTarget::GetLinkInterface(const char* config,
//----------------------------------------------------------------------------
void cmTarget::GetTransitivePropertyLinkLibraries(
const char* config,
- const cmTarget* headTarget,
- std::vector<std::string> &libs) const
+ cmTarget *headTarget,
+ std::vector<std::string> &libs)
{
cmTarget::LinkInterface const* iface = this->GetLinkInterface(config,
headTarget);
@@ -5318,7 +5312,7 @@ void cmTarget::GetTransitivePropertyLinkLibraries(
//----------------------------------------------------------------------------
bool cmTarget::ComputeLinkInterface(const char* config, LinkInterface& iface,
- const cmTarget* headTarget) const
+ cmTarget *headTarget)
{
// Construct the property name suffix for this configuration.
std::string suffix = "_";
@@ -5580,7 +5574,7 @@ bool cmTarget::ComputeLinkInterface(const char* config, LinkInterface& iface,
//----------------------------------------------------------------------------
cmTarget::LinkImplementation const*
-cmTarget::GetLinkImplementation(const char* config, const cmTarget* head) const
+cmTarget::GetLinkImplementation(const char* config, cmTarget *head)
{
// There is no link implementation for imported targets.
if(this->IsImported())
@@ -5610,7 +5604,7 @@ cmTarget::GetLinkImplementation(const char* config, const cmTarget* head) const
//----------------------------------------------------------------------------
void cmTarget::ComputeLinkImplementation(const char* config,
LinkImplementation& impl,
- const cmTarget* head) const
+ cmTarget *head)
{
// Compute which library configuration to link.
cmTarget::LinkLibraryType linkType = this->ComputeLinkType(config);
@@ -5692,8 +5686,7 @@ void cmTarget::ComputeLinkImplementation(const char* config,
// Get languages used in our source files.
this->GetLanguages(languages);
// Get languages used in object library sources.
- for(std::vector<std::string>::const_iterator
- i = this->ObjectLibraries.begin();
+ for(std::vector<std::string>::iterator i = this->ObjectLibraries.begin();
i != this->ObjectLibraries.end(); ++i)
{
if(cmTarget* objLib = this->Makefile->FindTargetToUse(i->c_str()))
@@ -5713,7 +5706,7 @@ void cmTarget::ComputeLinkImplementation(const char* config,
}
//----------------------------------------------------------------------------
-std::string cmTarget::CheckCMP0004(std::string const& item) const
+std::string cmTarget::CheckCMP0004(std::string const& item)
{
// Strip whitespace off the library names because we used to do this
// in case variables were expanded at generate time. We no longer
@@ -5772,14 +5765,14 @@ std::string cmTarget::CheckCMP0004(std::string const& item) const
}
template<typename PropertyType>
-PropertyType getLinkInterfaceDependentProperty(const cmTarget* tgt,
+PropertyType getLinkInterfaceDependentProperty(cmTarget *tgt,
const std::string prop,
const char *config,
CompatibleType,
PropertyType *);
template<>
-bool getLinkInterfaceDependentProperty(const cmTarget* tgt,
+bool getLinkInterfaceDependentProperty(cmTarget *tgt,
const std::string prop,
const char *config,
CompatibleType, bool *)
@@ -5788,7 +5781,7 @@ bool getLinkInterfaceDependentProperty(const cmTarget* tgt,
}
template<>
-const char * getLinkInterfaceDependentProperty(const cmTarget* tgt,
+const char * getLinkInterfaceDependentProperty(cmTarget *tgt,
const std::string prop,
const char *config,
CompatibleType t,
@@ -5812,7 +5805,7 @@ const char * getLinkInterfaceDependentProperty(const cmTarget* tgt,
//----------------------------------------------------------------------------
template<typename PropertyType>
-void checkPropertyConsistency(const cmTarget* depender, cmTarget *dependee,
+void checkPropertyConsistency(cmTarget *depender, cmTarget *dependee,
const char *propName,
std::set<cmStdString> &emitted,
const char *config,
@@ -5904,7 +5897,7 @@ static cmStdString intersect(const std::set<cmStdString> &s1,
//----------------------------------------------------------------------------
void cmTarget::CheckPropertyCompatibility(cmComputeLinkInformation *info,
- const char* config) const
+ const char* config)
{
const cmComputeLinkInformation::ItemVector &deps = info->GetItems();
@@ -6007,9 +6000,9 @@ void cmTarget::CheckPropertyCompatibility(cmComputeLinkInformation *info,
//----------------------------------------------------------------------------
cmComputeLinkInformation*
-cmTarget::GetLinkInformation(const char* config, const cmTarget* head) const
+cmTarget::GetLinkInformation(const char* config, cmTarget *head)
{
- const cmTarget* headTarget = head ? head : this;
+ cmTarget *headTarget = head ? head : this;
// Lookup any existing information for this configuration.
TargetConfigPair key(headTarget,
cmSystemTools::UpperCase(config?config:""));
@@ -6040,7 +6033,7 @@ cmTarget::GetLinkInformation(const char* config, const cmTarget* head) const
//----------------------------------------------------------------------------
std::string cmTarget::GetFrameworkDirectory(const char* config,
- bool rootDir) const
+ bool rootDir)
{
std::string fpath;
fpath += this->GetOutputName(config, false);
@@ -6055,7 +6048,7 @@ std::string cmTarget::GetFrameworkDirectory(const char* config,
//----------------------------------------------------------------------------
std::string cmTarget::GetCFBundleDirectory(const char* config,
- bool contentOnly) const
+ bool contentOnly)
{
std::string fpath;
fpath += this->GetOutputName(config, false);
@@ -6074,7 +6067,7 @@ std::string cmTarget::GetCFBundleDirectory(const char* config,
//----------------------------------------------------------------------------
std::string cmTarget::GetAppBundleDirectory(const char* config,
- bool contentOnly) const
+ bool contentOnly)
{
std::string fpath = this->GetFullName(config, false);
fpath += ".app/Contents";
@@ -6086,7 +6079,7 @@ std::string cmTarget::GetAppBundleDirectory(const char* config,
//----------------------------------------------------------------------------
std::string cmTarget::BuildMacContentDirectory(const std::string& base,
const char* config,
- bool contentOnly) const
+ bool contentOnly)
{
std::string fpath = base;
if(this->IsAppBundleOnApple())
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 432386d..41af8ab 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -36,10 +36,9 @@ class cmListFileBacktrace;
class cmTarget;
struct cmTargetLinkInformationMap:
- public std::map<std::pair<const cmTarget* , std::string>,
- cmComputeLinkInformation*>
+ public std::map<std::pair<cmTarget*, std::string>, cmComputeLinkInformation*>
{
- typedef std::map<std::pair<const cmTarget* , std::string>,
+ typedef std::map<std::pair<cmTarget*, std::string>,
cmComputeLinkInformation*> derived;
cmTargetLinkInformationMap() {}
cmTargetLinkInformationMap(cmTargetLinkInformationMap const& r);
@@ -95,7 +94,7 @@ public:
///! Set/Get the name of the target
const char* GetName() const {return this->Name.c_str();}
- const char* GetExportName() const;
+ const char* GetExportName();
///! Set the cmMakefile that owns this target
void SetMakefile(cmMakefile *mf);
@@ -177,13 +176,13 @@ public:
{return this->OriginalLinkLibraries;}
void GetDirectLinkLibraries(const char *config,
std::vector<std::string> &,
- const cmTarget* head) const;
+ cmTarget *head);
void GetInterfaceLinkLibraries(const char *config,
std::vector<std::string> &,
cmTarget *head);
/** Compute the link type to use for the given configuration. */
- LinkLibraryType ComputeLinkType(const char* config) const;
+ LinkLibraryType ComputeLinkType(const char* config);
/**
* Clear the dependency information recorded for this target, if any.
@@ -205,7 +204,7 @@ public:
void MergeLinkLibraries( cmMakefile& mf, const char* selfname,
const LinkLibraryVectorType& libs );
- const std::vector<std::string>& GetLinkDirectories() const;
+ const std::vector<std::string>& GetLinkDirectories();
void AddLinkDirectory(const char* d);
@@ -227,7 +226,7 @@ public:
/**
* Get/Set whether there is an install rule for this target.
*/
- bool GetHaveInstallRule() const { return this->HaveInstallRule; }
+ bool GetHaveInstallRule() { return this->HaveInstallRule; }
void SetHaveInstallRule(bool h) { this->HaveInstallRule = h; }
/** Add a utility on which this project depends. A utility is an executable
@@ -244,9 +243,9 @@ public:
///! Set/Get a property of this target file
void SetProperty(const char *prop, const char *value);
void AppendProperty(const char* prop, const char* value,bool asString=false);
- const char *GetProperty(const char *prop) const;
- const char *GetProperty(const char *prop, cmProperty::ScopeType scope) const;
- bool GetPropertyAsBool(const char *prop) const;
+ const char *GetProperty(const char *prop);
+ const char *GetProperty(const char *prop, cmProperty::ScopeType scope);
+ bool GetPropertyAsBool(const char *prop);
void CheckProperty(const char* prop, cmMakefile* context);
const char* GetFeature(const char* feature, const char* config);
@@ -282,10 +281,10 @@ public:
/** Get the link interface for the given configuration. Returns 0
if the target cannot be linked. */
LinkInterface const* GetLinkInterface(const char* config,
- const cmTarget* headTarget) const;
+ cmTarget *headTarget);
void GetTransitivePropertyLinkLibraries(const char* config,
- const cmTarget* headTarget,
- std::vector<std::string> &libs) const;
+ cmTarget *headTarget,
+ std::vector<std::string> &libs);
/** The link implementation specifies the direct library
dependencies needed by the object files of the target. */
@@ -302,7 +301,7 @@ public:
std::vector<std::string> WrongConfigLibraries;
};
LinkImplementation const* GetLinkImplementation(const char* config,
- const cmTarget* head) const;
+ cmTarget *head);
/** Link information from the transitive closure of the link
implementation and the interfaces of its dependencies. */
@@ -314,18 +313,17 @@ public:
// Languages whose runtime libraries must be linked.
std::vector<std::string> Languages;
};
- LinkClosure const* GetLinkClosure(const char* config,
- const cmTarget* head) const;
+ LinkClosure const* GetLinkClosure(const char* config, cmTarget *head);
/** Strip off leading and trailing whitespace from an item named in
the link dependencies of this target. */
- std::string CheckCMP0004(std::string const& item) const;
+ std::string CheckCMP0004(std::string const& item);
/** Get the directory in which this target will be built. If the
configuration name is given then the generator will add its
subdirectory for that configuration. Otherwise just the canonical
output directory is given. */
- std::string GetDirectory(const char* config = 0, bool implib = false) const;
+ std::string GetDirectory(const char* config = 0, bool implib = false);
/** Get the directory in which this targets .pdb files will be placed.
If the configuration name is given then the generator will add its
@@ -336,7 +334,7 @@ public:
/** Get the location of the target in the build tree for the given
configuration. This location is suitable for use as the LOCATION
target property. */
- const char* GetLocation(const char* config) const;
+ const char* GetLocation(const char* config);
/** Get the target major and minor version numbers interpreted from
the VERSION property. Version 0 is returned if the property is
@@ -360,24 +358,23 @@ public:
bool FindSourceFiles();
///! Return the preferred linker language for this target
- const char* GetLinkerLanguage(const char* config = 0,
- const cmTarget* head = 0) const;
+ const char* GetLinkerLanguage(const char* config = 0, cmTarget *head = 0);
/** Get the full name of the target according to the settings in its
makefile. */
- std::string GetFullName(const char* config=0, bool implib = false) const;
+ std::string GetFullName(const char* config=0, bool implib = false);
void GetFullNameComponents(std::string& prefix,
std::string& base, std::string& suffix,
const char* config=0, bool implib = false);
/** Get the name of the pdb file for the target. */
- std::string GetPDBName(const char* config=0) const;
+ std::string GetPDBName(const char* config=0);
/** Whether this library has soname enabled and platform supports it. */
- bool HasSOName(const char* config) const;
+ bool HasSOName(const char* config);
/** Get the soname of the target. Allowed only for a shared library. */
- std::string GetSOName(const char* config) const;
+ std::string GetSOName(const char* config);
/** Whether this library has \@rpath and platform supports it. */
bool HasMacOSXRpath(const char* config);
@@ -389,21 +386,21 @@ public:
/** Get the full path to the target according to the settings in its
makefile and the configuration type. */
std::string GetFullPath(const char* config=0, bool implib = false,
- bool realname = false) const;
+ bool realname = false);
/** Get the names of the library needed to generate a build rule
that takes into account shared library version numbers. This
should be called only on a library target. */
void GetLibraryNames(std::string& name, std::string& soName,
std::string& realName, std::string& impName,
- std::string& pdbName, const char* config) const;
+ std::string& pdbName, const char* config);
/** Get the names of the executable needed to generate a build rule
that takes into account executable version numbers. This should
be called only on an executable target. */
void GetExecutableNames(std::string& name, std::string& realName,
std::string& impName,
- std::string& pdbName, const char* config) const;
+ std::string& pdbName, const char* config);
/** Does this target have a GNU implib to convert to MS format? */
bool HasImplibGNUtoMS();
@@ -418,11 +415,11 @@ public:
*/
bool NeedRelinkBeforeInstall(const char* config);
- bool HaveBuildTreeRPATH(const char *config) const;
- bool HaveInstallTreeRPATH() const;
+ bool HaveBuildTreeRPATH(const char *config);
+ bool HaveInstallTreeRPATH();
/** Return true if builtin chrpath will work for this target */
- bool IsChrpathUsed(const char* config) const;
+ bool IsChrpathUsed(const char* config);
/** Return the install name directory for the target in the
* build tree. For example: "\@rpath/", "\@loader_path/",
@@ -434,15 +431,15 @@ public:
std::string GetInstallNameDirForInstallTree();
cmComputeLinkInformation* GetLinkInformation(const char* config,
- const cmTarget* head = 0) const;
+ cmTarget *head = 0);
// Get the properties
- cmPropertyMap &GetProperties() const { return this->Properties; };
+ cmPropertyMap &GetProperties() { return this->Properties; };
bool GetMappedConfig(std::string const& desired_config,
const char** loc,
const char** imp,
- std::string& suffix) const;
+ std::string& suffix);
// Define the properties
static void DefineProperties(cmake *cm);
@@ -463,7 +460,7 @@ public:
/** Return whether this target is an executable with symbol exports
enabled. */
- bool IsExecutableWithExports() const;
+ bool IsExecutableWithExports();
/** Return whether this target may be used to link another target. */
bool IsLinkable();
@@ -472,25 +469,25 @@ public:
bool IsDLLPlatform() { return this->DLLPlatform; }
/** Return whether or not the target has a DLL import library. */
- bool HasImportLibrary() const;
+ bool HasImportLibrary();
/** Return whether this target is a shared library Framework on
Apple. */
- bool IsFrameworkOnApple() const;
+ bool IsFrameworkOnApple();
/** Return whether this target is a CFBundle (plugin) on Apple. */
- bool IsCFBundleOnApple() const;
+ bool IsCFBundleOnApple();
/** Return whether this target is an executable Bundle on Apple. */
- bool IsAppBundleOnApple() const;
+ bool IsAppBundleOnApple();
/** Return whether this target is an executable Bundle, a framework
or CFBundle on Apple. */
- bool IsBundleOnApple() const;
+ bool IsBundleOnApple();
/** Return the framework version string. Undefined if
IsFrameworkOnApple returns false. */
- std::string GetFrameworkVersion() const;
+ std::string GetFrameworkVersion();
/** Get a backtrace from the creation of the target. */
cmListFileBacktrace const& GetBacktrace() const;
@@ -507,17 +504,16 @@ public:
bool implib);
/** @return whether this target have a well defined output file name. */
- bool HaveWellDefinedOutputFiles() const;
+ bool HaveWellDefinedOutputFiles();
/** @return the Mac framework directory without the base. */
- std::string GetFrameworkDirectory(const char* config, bool rootDir) const;
+ std::string GetFrameworkDirectory(const char* config, bool rootDir);
/** @return the Mac CFBundle directory without the base */
- std::string GetCFBundleDirectory(const char* config, bool contentOnly) const;
+ std::string GetCFBundleDirectory(const char* config, bool contentOnly);
/** @return the Mac App directory without the base */
- std::string GetAppBundleDirectory(const char* config,
- bool contentOnly) const;
+ std::string GetAppBundleDirectory(const char* config, bool contentOnly);
std::vector<std::string> GetIncludeDirectories(const char *config);
void InsertInclude(const cmValueWithOrigin &entry,
@@ -532,25 +528,25 @@ public:
void GetCompileOptions(std::vector<std::string> &result,
const char *config);
- bool IsNullImpliedByLinkLibraries(const std::string &p) const;
+ bool IsNullImpliedByLinkLibraries(const std::string &p);
bool IsLinkInterfaceDependentBoolProperty(const std::string &p,
- const char *config) const;
+ const char *config);
bool IsLinkInterfaceDependentStringProperty(const std::string &p,
- const char *config) const;
+ const char *config);
bool IsLinkInterfaceDependentNumberMinProperty(const std::string &p,
- const char *config) const;
+ const char *config);
bool IsLinkInterfaceDependentNumberMaxProperty(const std::string &p,
- const char *config) const;
+ const char *config);
bool GetLinkInterfaceDependentBoolProperty(const std::string &p,
- const char *config) const;
+ const char *config);
const char *GetLinkInterfaceDependentStringProperty(const std::string &p,
- const char *config) const;
+ const char *config);
const char *GetLinkInterfaceDependentNumberMinProperty(const std::string &p,
- const char *config) const;
+ const char *config);
const char *GetLinkInterfaceDependentNumberMaxProperty(const std::string &p,
- const char *config) const;
+ const char *config);
std::string GetDebugGeneratorExpressions(const std::string &value,
cmTarget::LinkLibraryType llt);
@@ -566,7 +562,7 @@ public:
{ return this->TargetTypeValue == STATIC_LIBRARY; }
private:
- bool HandleLocationPropertyPolicy() const;
+ bool HandleLocationPropertyPolicy();
// The set of include directories that are marked as system include
// directories.
@@ -625,42 +621,42 @@ private:
void AnalyzeLibDependencies( const cmMakefile& mf );
- const char* GetSuffixVariableInternal(bool implib) const;
- const char* GetPrefixVariableInternal(bool implib) const;
- std::string GetFullNameInternal(const char* config, bool implib) const;
+ const char* GetSuffixVariableInternal(bool implib);
+ const char* GetPrefixVariableInternal(bool implib);
+ std::string GetFullNameInternal(const char* config, bool implib);
void GetFullNameInternal(const char* config, bool implib,
std::string& outPrefix, std::string& outBase,
- std::string& outSuffix) const;
+ std::string& outSuffix);
// Use a makefile variable to set a default for the given property.
// If the variable is not defined use the given default instead.
void SetPropertyDefault(const char* property, const char* default_value);
// Returns ARCHIVE, LIBRARY, or RUNTIME based on platform and type.
- const char* GetOutputTargetType(bool implib) const;
+ const char* GetOutputTargetType(bool implib);
// Get the target base name.
- std::string GetOutputName(const char* config, bool implib) const;
+ std::string GetOutputName(const char* config, bool implib);
- const char* ImportedGetLocation(const char* config) const;
- const char* NormalGetLocation(const char* config) const;
+ const char* ImportedGetLocation(const char* config);
+ const char* NormalGetLocation(const char* config);
- std::string GetFullNameImported(const char* config, bool implib) const;
+ std::string GetFullNameImported(const char* config, bool implib);
- std::string ImportedGetFullPath(const char* config, bool implib) const;
+ std::string ImportedGetFullPath(const char* config, bool implib);
std::string NormalGetFullPath(const char* config, bool implib,
- bool realname) const;
+ bool realname);
/** Get the real name of the target. Allowed only for non-imported
targets. When a library or executable file is versioned this is
the full versioned name. If the target is not versioned this is
the same as GetFullName. */
- std::string NormalGetRealName(const char* config) const;
+ std::string NormalGetRealName(const char* config);
/** Append to @a base the mac content directory and return it. */
std::string BuildMacContentDirectory(const std::string& base,
const char* config,
- bool contentOnly) const;
+ bool contentOnly);
private:
std::string Name;
@@ -681,7 +677,7 @@ private:
std::string ExportMacro;
std::set<cmStdString> Utilities;
bool RecordDependencies;
- mutable cmPropertyMap Properties;
+ cmPropertyMap Properties;
LinkLibraryVectorType OriginalLinkLibraries;
bool DLLPlatform;
bool IsApple;
@@ -694,30 +690,27 @@ private:
// Cache target output paths for each configuration.
struct OutputInfo;
- OutputInfo const* GetOutputInfo(const char* config) const;
- bool
- ComputeOutputDir(const char* config, bool implib, std::string& out) const;
- bool ComputePDBOutputDir(const char* config, std::string& out) const;
+ OutputInfo const* GetOutputInfo(const char* config);
+ bool ComputeOutputDir(const char* config, bool implib, std::string& out);
+ bool ComputePDBOutputDir(const char* config, std::string& out);
// Cache import information from properties for each configuration.
struct ImportInfo;
ImportInfo const* GetImportInfo(const char* config,
- const cmTarget* workingTarget) const;
+ cmTarget *workingTarget);
void ComputeImportInfo(std::string const& desired_config, ImportInfo& info,
- const cmTarget* head) const;
+ cmTarget *head);
- mutable cmTargetLinkInformationMap LinkInformation;
+ cmTargetLinkInformationMap LinkInformation;
void CheckPropertyCompatibility(cmComputeLinkInformation *info,
- const char* config) const;
+ const char* config);
bool ComputeLinkInterface(const char* config, LinkInterface& iface,
- const cmTarget* head) const;
+ cmTarget *head);
void ComputeLinkImplementation(const char* config,
- LinkImplementation& impl,
- const cmTarget* head) const;
- void ComputeLinkClosure(const char* config, LinkClosure& lc,
- const cmTarget* head) const;
+ LinkImplementation& impl, cmTarget *head);
+ void ComputeLinkClosure(const char* config, LinkClosure& lc, cmTarget *head);
void ClearLinkMaps();
@@ -747,7 +740,7 @@ private:
std::string const& base,
std::string const& suffix,
std::string const& name,
- const char* version) const;
+ const char* version);
};
typedef std::map<cmStdString,cmTarget> cmTargets;
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index 6b6fe4c..9add198 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -384,13 +384,8 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const char* lib,
}
}
- if(this->CurrentProcessingState == ProcessingLinkLibraries
- && !this->Target->GetProperty("LINK_INTERFACE_LIBRARIES"))
- {
- this->Makefile
- ->AddLinkLibraryForTarget(this->Target->GetName(), lib, llt);
- }
- else if(this->CurrentProcessingState != ProcessingKeywordLinkInterface
+ // Handle normal case first.
+ if(this->CurrentProcessingState != ProcessingKeywordLinkInterface
&& this->CurrentProcessingState != ProcessingPlainLinkInterface)
{
this->Makefile
-----------------------------------------------------------------------
Summary of changes:
Source/cmComputeLinkDepends.cxx | 3 +-
Source/cmComputeLinkDepends.h | 7 +-
Source/cmComputeLinkInformation.cxx | 4 +-
Source/cmComputeLinkInformation.h | 8 +-
Source/cmCoreTryCompile.cxx | 2 +-
Source/cmExportFileGenerator.cxx | 6 +-
Source/cmExportFileGenerator.h | 6 +-
Source/cmExportTryCompileFileGenerator.cxx | 18 ++--
Source/cmExportTryCompileFileGenerator.h | 12 +-
Source/cmFindCommon.cxx | 15 +--
Source/cmGeneratorExpression.cxx | 6 +-
Source/cmGeneratorExpression.h | 10 +-
Source/cmGeneratorExpressionEvaluator.cxx | 12 +-
Source/cmGeneratorExpressionEvaluator.h | 8 +-
Source/cmOrderDirectories.cxx | 2 +-
Source/cmOrderDirectories.h | 4 +-
Source/cmTarget.cxx | 197 +++++++++++++--------------
Source/cmTarget.h | 163 +++++++++++------------
Source/cmTargetLinkLibrariesCommand.cxx | 9 +-
19 files changed, 229 insertions(+), 263 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list