[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1228-gff766a5
Stephen Kelly
steveire at gmail.com
Tue Jul 21 15:26:44 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 ff766a5d58f109450c11ac63a686f8129e33c614 (commit)
via 22872e8e3ac7e538deaa72fdb5ff312d539d46c4 (commit)
from ce401b860457dd1aaab3af16150f1cb8aa2c2c72 (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=ff766a5d58f109450c11ac63a686f8129e33c614
commit ff766a5d58f109450c11ac63a686f8129e33c614
Merge: ce401b8 22872e8
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 21 15:26:43 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 21 15:26:43 2015 -0400
Merge topic 'refactor-cmMakefile-properties' into next
22872e8e Revert topic.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22872e8e3ac7e538deaa72fdb5ff312d539d46c4
commit 22872e8e3ac7e538deaa72fdb5ff312d539d46c4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 21 21:26:09 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jul 21 21:26:18 2015 +0200
Revert topic.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 40a8586..88ac0bc 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1417,10 +1417,8 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
{
cmMakefile *mf = this->LocalGenerators[i]->GetMakefile();
- const cmStringRange noconfig_compile_definitions =
+ const std::vector<cmValueWithOrigin> noconfig_compile_definitions =
mf->GetCompileDefinitionsEntries();
- const cmBacktraceRange noconfig_compile_definitions_bts =
- mf->GetCompileDefinitionsBacktraces();
cmTargets& targets = mf->GetTargets();
for(cmTargets::iterator ti = targets.begin();
@@ -1435,13 +1433,11 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
continue;
}
- cmBacktraceRange::const_iterator btIt
- = noconfig_compile_definitions_bts.begin();
- for (cmStringRange::const_iterator it
+ for (std::vector<cmValueWithOrigin>::const_iterator it
= noconfig_compile_definitions.begin();
- it != noconfig_compile_definitions.end(); ++it, ++btIt)
+ it != noconfig_compile_definitions.end(); ++it)
{
- t->InsertCompileDefinition(*it, *btIt);
+ t->InsertCompileDefinition(*it);
}
cmPolicies::PolicyStatus polSt
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index a1d9f22..e4ecd1f 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -273,36 +273,6 @@ void cmMakefile::IssueMessage(cmake::MessageType t,
}
}
-cmStringRange cmMakefile::GetIncludeDirectoriesEntries() const
-{
- return cmMakeRange(this->IncludeDirectoriesEntries);
-}
-
-cmBacktraceRange cmMakefile::GetIncludeDirectoriesBacktraces() const
-{
- return cmMakeRange(this->IncludeDirectoriesEntryBacktraces);
-}
-
-cmStringRange cmMakefile::GetCompileOptionsEntries() const
-{
- return cmMakeRange(this->CompileOptionsEntries);
-}
-
-cmBacktraceRange cmMakefile::GetCompileOptionsBacktraces() const
-{
- return cmMakeRange(this->CompileOptionsEntryBacktraces);
-}
-
-cmStringRange cmMakefile::GetCompileDefinitionsEntries() const
-{
- return cmMakeRange(this->CompileDefinitionsEntries);
-}
-
-cmBacktraceRange cmMakefile::GetCompileDefinitionsBacktraces() const
-{
- return cmMakeRange(this->CompileDefinitionsEntryBacktraces);
-}
-
//----------------------------------------------------------------------------
cmListFileBacktrace cmMakefile::GetBacktrace() const
{
@@ -1557,32 +1527,23 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent)
this->AddDefinition("CMAKE_CURRENT_BINARY_DIR",
this->GetCurrentBinaryDirectory());
- this->IncludeDirectoriesEntries.insert(
- this->IncludeDirectoriesEntries.end(),
- parent->IncludeDirectoriesEntries.begin(),
- parent->IncludeDirectoriesEntries.end());
- this->IncludeDirectoriesEntryBacktraces.insert(
- this->IncludeDirectoriesEntryBacktraces.end(),
- parent->IncludeDirectoriesEntryBacktraces.begin(),
- parent->IncludeDirectoriesEntryBacktraces.end());
-
- this->CompileOptionsEntries.insert(
- this->CompileOptionsEntries.end(),
- parent->CompileOptionsEntries.begin(),
- parent->CompileOptionsEntries.end());
- this->CompileOptionsEntryBacktraces.insert(
- this->CompileOptionsEntryBacktraces.end(),
- parent->CompileOptionsEntryBacktraces.begin(),
- parent->CompileOptionsEntryBacktraces.end());
-
- this->CompileDefinitionsEntries.insert(
- this->CompileDefinitionsEntries.end(),
- parent->CompileDefinitionsEntries.begin(),
- parent->CompileDefinitionsEntries.end());
- this->CompileDefinitionsEntryBacktraces.insert(
- this->CompileDefinitionsEntryBacktraces.end(),
- parent->CompileDefinitionsEntryBacktraces.begin(),
- parent->CompileDefinitionsEntryBacktraces.end());
+ const std::vector<cmValueWithOrigin>& parentIncludes =
+ parent->GetIncludeDirectoriesEntries();
+ this->IncludeDirectoriesEntries.insert(this->IncludeDirectoriesEntries.end(),
+ parentIncludes.begin(),
+ parentIncludes.end());
+
+ const std::vector<cmValueWithOrigin>& parentOptions =
+ parent->GetCompileOptionsEntries();
+ this->CompileOptionsEntries.insert(this->CompileOptionsEntries.end(),
+ parentOptions.begin(),
+ parentOptions.end());
+
+ const std::vector<cmValueWithOrigin>& parentDefines =
+ parent->GetCompileDefinitionsEntries();
+ this->CompileDefinitionsEntries.insert(this->CompileDefinitionsEntries.end(),
+ parentDefines.begin(),
+ parentDefines.end());
this->SystemIncludeDirectories = parent->SystemIncludeDirectories;
@@ -1926,21 +1887,20 @@ void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs,
return;
}
- std::vector<std::string>::iterator position =
+ std::vector<cmValueWithOrigin>::iterator position =
before ? this->IncludeDirectoriesEntries.begin()
: this->IncludeDirectoriesEntries.end();
cmListFileBacktrace lfbt = this->GetBacktrace();
- std::string entryString = cmJoin(incs, ";");
- this->IncludeDirectoriesEntries.insert(position, entryString);
- this->IncludeDirectoriesEntryBacktraces.push_back(lfbt);
+ cmValueWithOrigin entry(cmJoin(incs, ";"), lfbt);
+ this->IncludeDirectoriesEntries.insert(position, entry);
// Property on each target:
for (cmTargets::iterator l = this->Targets.begin();
l != this->Targets.end(); ++l)
{
cmTarget &t = l->second;
- t.InsertInclude(entryString, lfbt, before);
+ t.InsertInclude(entry, before);
}
}
@@ -4160,40 +4120,36 @@ void cmMakefile::SetProperty(const std::string& prop, const char* value)
if (prop == "INCLUDE_DIRECTORIES")
{
this->IncludeDirectoriesEntries.clear();
- this->IncludeDirectoriesEntryBacktraces.clear();
if (!value)
{
return;
}
cmListFileBacktrace lfbt = this->GetBacktrace();
- this->IncludeDirectoriesEntries.push_back(value);
- this->IncludeDirectoriesEntryBacktraces.push_back(lfbt);
+ this->IncludeDirectoriesEntries.push_back(
+ cmValueWithOrigin(value, lfbt));
return;
}
if (prop == "COMPILE_OPTIONS")
{
this->CompileOptionsEntries.clear();
- this->CompileDefinitionsEntryBacktraces.clear();
if (!value)
{
return;
}
cmListFileBacktrace lfbt = this->GetBacktrace();
- this->CompileOptionsEntries.push_back(value);
- this->CompileOptionsEntryBacktraces.push_back(lfbt);
+ this->CompileOptionsEntries.push_back(cmValueWithOrigin(value, lfbt));
return;
}
if (prop == "COMPILE_DEFINITIONS")
{
this->CompileDefinitionsEntries.clear();
- this->CompileDefinitionsEntryBacktraces.clear();
if (!value)
{
return;
}
cmListFileBacktrace lfbt = this->GetBacktrace();
- this->CompileDefinitionsEntries.push_back(value);
- this->CompileDefinitionsEntryBacktraces.push_back(lfbt);
+ cmValueWithOrigin entry(value, lfbt);
+ this->CompileDefinitionsEntries.push_back(entry);
return;
}
@@ -4207,22 +4163,22 @@ void cmMakefile::AppendProperty(const std::string& prop,
if (prop == "INCLUDE_DIRECTORIES")
{
cmListFileBacktrace lfbt = this->GetBacktrace();
- this->IncludeDirectoriesEntries.push_back(value);
- this->IncludeDirectoriesEntryBacktraces.push_back(lfbt);
+ this->IncludeDirectoriesEntries.push_back(
+ cmValueWithOrigin(value, lfbt));
return;
}
if (prop == "COMPILE_OPTIONS")
{
cmListFileBacktrace lfbt = this->GetBacktrace();
- this->CompileOptionsEntries.push_back(value);
- this->CompileOptionsEntryBacktraces.push_back(lfbt);
+ this->CompileOptionsEntries.push_back(
+ cmValueWithOrigin(value, lfbt));
return;
}
if (prop == "COMPILE_DEFINITIONS")
{
cmListFileBacktrace lfbt = this->GetBacktrace();
- this->CompileDefinitionsEntries.push_back(value);
- this->CompileDefinitionsEntryBacktraces.push_back(lfbt);
+ this->CompileDefinitionsEntries.push_back(
+ cmValueWithOrigin(value, lfbt));
return;
}
@@ -4277,17 +4233,44 @@ const char *cmMakefile::GetProperty(const std::string& prop,
}
else if (prop == "INCLUDE_DIRECTORIES")
{
- output = cmJoin(this->IncludeDirectoriesEntries, ";");
+ std::string sep;
+ for (std::vector<cmValueWithOrigin>::const_iterator
+ it = this->IncludeDirectoriesEntries.begin(),
+ end = this->IncludeDirectoriesEntries.end();
+ it != end; ++it)
+ {
+ output += sep;
+ output += it->Value;
+ sep = ";";
+ }
return output.c_str();
}
else if (prop == "COMPILE_OPTIONS")
{
- output = cmJoin(this->CompileOptionsEntries, ";");
+ std::string sep;
+ for (std::vector<cmValueWithOrigin>::const_iterator
+ it = this->CompileOptionsEntries.begin(),
+ end = this->CompileOptionsEntries.end();
+ it != end; ++it)
+ {
+ output += sep;
+ output += it->Value;
+ sep = ";";
+ }
return output.c_str();
}
else if (prop == "COMPILE_DEFINITIONS")
{
- output = cmJoin(this->CompileDefinitionsEntries, ";");
+ std::string sep;
+ for (std::vector<cmValueWithOrigin>::const_iterator
+ it = this->CompileDefinitionsEntries.begin(),
+ end = this->CompileDefinitionsEntries.end();
+ it != end; ++it)
+ {
+ output += sep;
+ output += it->Value;
+ sep = ";";
+ }
return output.c_str();
}
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 27911a9..2fc4d78 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -22,7 +22,6 @@
#include "cmExpandedCommandArgument.h"
#include "cmake.h"
#include "cmState.h"
-#include "cmAlgorithms.h"
#if defined(CMAKE_BUILD_WITH_CMAKE)
#include "cmSourceGroup.h"
@@ -747,12 +746,18 @@ public:
/** Set whether or not to report a CMP0000 violation. */
void SetCheckCMP0000(bool b) { this->CheckCMP0000 = b; }
- cmStringRange GetIncludeDirectoriesEntries() const;
- cmBacktraceRange GetIncludeDirectoriesBacktraces() const;
- cmStringRange GetCompileOptionsEntries() const;
- cmBacktraceRange GetCompileOptionsBacktraces() const;
- cmStringRange GetCompileDefinitionsEntries() const;
- cmBacktraceRange GetCompileDefinitionsBacktraces() const;
+ const std::vector<cmValueWithOrigin>& GetIncludeDirectoriesEntries() const
+ {
+ return this->IncludeDirectoriesEntries;
+ }
+ const std::vector<cmValueWithOrigin>& GetCompileOptionsEntries() const
+ {
+ return this->CompileOptionsEntries;
+ }
+ const std::vector<cmValueWithOrigin>& GetCompileDefinitionsEntries() const
+ {
+ return this->CompileDefinitionsEntries;
+ }
bool IsConfigured() const { return this->Configured; }
void SetConfigured(){ this->Configured = true; }
@@ -846,12 +851,9 @@ protected:
std::vector<std::string> HeaderFileExtensions;
std::string DefineFlags;
- std::vector<std::string> IncludeDirectoriesEntries;
- std::vector<cmListFileBacktrace> IncludeDirectoriesEntryBacktraces;
- std::vector<std::string> CompileOptionsEntries;
- std::vector<cmListFileBacktrace> CompileOptionsEntryBacktraces;
- std::vector<std::string> CompileDefinitionsEntries;
- std::vector<cmListFileBacktrace> CompileDefinitionsEntryBacktraces;
+ std::vector<cmValueWithOrigin> IncludeDirectoriesEntries;
+ std::vector<cmValueWithOrigin> CompileOptionsEntries;
+ std::vector<cmValueWithOrigin> CompileDefinitionsEntries;
// Track the value of the computed DEFINITIONS property.
void AddDefineFlag(const char*, std::string&);
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 22114fd..ac39387 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -402,17 +402,13 @@ void cmTarget::SetMakefile(cmMakefile* mf)
{
// Initialize the INCLUDE_DIRECTORIES property based on the current value
// of the same directory property:
- const cmStringRange parentIncludes =
- this->Makefile->GetIncludeDirectoriesEntries();
- const cmBacktraceRange parentIncludesBts =
- this->Makefile->GetIncludeDirectoriesBacktraces();
+ const std::vector<cmValueWithOrigin> parentIncludes =
+ this->Makefile->GetIncludeDirectoriesEntries();
- cmBacktraceRange::const_iterator btIt = parentIncludesBts.begin();
- for (cmStringRange::const_iterator it
- = parentIncludes.begin();
- it != parentIncludes.end(); ++it, ++btIt)
+ for (std::vector<cmValueWithOrigin>::const_iterator it
+ = parentIncludes.begin(); it != parentIncludes.end(); ++it)
{
- this->InsertInclude(*it, *btIt);
+ this->InsertInclude(*it);
}
const std::set<std::string> parentSystemIncludes =
this->Makefile->GetSystemIncludeDirectories();
@@ -420,17 +416,13 @@ void cmTarget::SetMakefile(cmMakefile* mf)
this->SystemIncludeDirectories.insert(parentSystemIncludes.begin(),
parentSystemIncludes.end());
- const cmStringRange parentOptions =
+ const std::vector<cmValueWithOrigin> parentOptions =
this->Makefile->GetCompileOptionsEntries();
- const cmBacktraceRange parentOptionsBts =
- this->Makefile->GetCompileOptionsBacktraces();
- btIt = parentOptionsBts.begin();
- for (cmStringRange::const_iterator it
- = parentOptions.begin();
- it != parentOptions.end(); ++it, ++btIt)
+ for (std::vector<cmValueWithOrigin>::const_iterator it
+ = parentOptions.begin(); it != parentOptions.end(); ++it)
{
- this->InsertCompileOption(*it, *btIt);
+ this->InsertCompileOption(*it);
}
}
@@ -1934,43 +1926,40 @@ void cmTarget::AppendBuildInterfaceIncludes()
}
//----------------------------------------------------------------------------
-void cmTarget::InsertInclude(std::string const& entry,
- cmListFileBacktrace const& bt,
- bool before)
+void cmTarget::InsertInclude(const cmValueWithOrigin &entry,
+ bool before)
{
- cmGeneratorExpression ge(bt);
+ cmGeneratorExpression ge(entry.Backtrace);
std::vector<cmTargetInternals::TargetPropertyEntry*>::iterator position
= before ? this->Internal->IncludeDirectoriesEntries.begin()
: this->Internal->IncludeDirectoriesEntries.end();
this->Internal->IncludeDirectoriesEntries.insert(position,
- new cmTargetInternals::TargetPropertyEntry(ge.Parse(entry)));
+ new cmTargetInternals::TargetPropertyEntry(ge.Parse(entry.Value)));
}
//----------------------------------------------------------------------------
-void cmTarget::InsertCompileOption(std::string const& entry,
- cmListFileBacktrace const& bt,
- bool before)
+void cmTarget::InsertCompileOption(const cmValueWithOrigin &entry,
+ bool before)
{
- cmGeneratorExpression ge(bt);
+ cmGeneratorExpression ge(entry.Backtrace);
std::vector<cmTargetInternals::TargetPropertyEntry*>::iterator position
= before ? this->Internal->CompileOptionsEntries.begin()
: this->Internal->CompileOptionsEntries.end();
this->Internal->CompileOptionsEntries.insert(position,
- new cmTargetInternals::TargetPropertyEntry(ge.Parse(entry)));
+ new cmTargetInternals::TargetPropertyEntry(ge.Parse(entry.Value)));
}
//----------------------------------------------------------------------------
-void cmTarget::InsertCompileDefinition(std::string const& entry,
- cmListFileBacktrace const& bt)
+void cmTarget::InsertCompileDefinition(const cmValueWithOrigin &entry)
{
- cmGeneratorExpression ge(bt);
+ cmGeneratorExpression ge(entry.Backtrace);
this->Internal->CompileDefinitionsEntries.push_back(
- new cmTargetInternals::TargetPropertyEntry(ge.Parse(entry)));
+ new cmTargetInternals::TargetPropertyEntry(ge.Parse(entry.Value)));
}
//----------------------------------------------------------------------------
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index f9bcb05..1920312 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -572,14 +572,11 @@ public:
std::vector<std::string> GetIncludeDirectories(
const std::string& config,
const std::string& language) const;
- void InsertInclude(std::string const& entry,
- cmListFileBacktrace const& bt,
+ void InsertInclude(const cmValueWithOrigin &entry,
bool before = false);
- void InsertCompileOption(std::string const& entry,
- cmListFileBacktrace const& bt,
- bool before = false);
- void InsertCompileDefinition(std::string const& entry,
- cmListFileBacktrace const& bt);
+ void InsertCompileOption(const cmValueWithOrigin &entry,
+ bool before = false);
+ void InsertCompileDefinition(const cmValueWithOrigin &entry);
void AppendBuildInterfaceIncludes();
diff --git a/Source/cmTargetCompileOptionsCommand.cxx b/Source/cmTargetCompileOptionsCommand.cxx
index 8e86f0f..a85153d 100644
--- a/Source/cmTargetCompileOptionsCommand.cxx
+++ b/Source/cmTargetCompileOptionsCommand.cxx
@@ -50,6 +50,7 @@ bool cmTargetCompileOptionsCommand
bool, bool)
{
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
- tgt->InsertCompileOption(this->Join(content), lfbt);
+ cmValueWithOrigin entry(this->Join(content), lfbt);
+ tgt->InsertCompileOption(entry);
return true;
}
diff --git a/Source/cmTargetIncludeDirectoriesCommand.cxx b/Source/cmTargetIncludeDirectoriesCommand.cxx
index 7824c89..24500db 100644
--- a/Source/cmTargetIncludeDirectoriesCommand.cxx
+++ b/Source/cmTargetIncludeDirectoriesCommand.cxx
@@ -72,7 +72,8 @@ bool cmTargetIncludeDirectoriesCommand
bool prepend, bool system)
{
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
- tgt->InsertInclude(this->Join(content), lfbt, prepend);
+ cmValueWithOrigin entry(this->Join(content), lfbt);
+ tgt->InsertInclude(entry, prepend);
if (system)
{
tgt->AddSystemIncludeDirectories(content);
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalGenerator.cxx | 12 +--
Source/cmMakefile.cxx | 141 +++++++++++---------------
Source/cmMakefile.h | 28 ++---
Source/cmTarget.cxx | 51 ++++------
Source/cmTarget.h | 11 +-
Source/cmTargetCompileOptionsCommand.cxx | 3 +-
Source/cmTargetIncludeDirectoriesCommand.cxx | 3 +-
7 files changed, 109 insertions(+), 140 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list