[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1224-ge030aff
Stephen Kelly
steveire at gmail.com
Tue Jul 21 15:12:24 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 e030aff24bc3bfd56b8d8e2567326cfa9382519f (commit)
via 97b5de6df0826cd4d4f706f5df5d11d8cb5137d2 (commit)
from 5be9e8f54c5a407356af587b28a6a82de527cdda (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=e030aff24bc3bfd56b8d8e2567326cfa9382519f
commit e030aff24bc3bfd56b8d8e2567326cfa9382519f
Merge: 5be9e8f 97b5de6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 21 15:12:23 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 21 15:12:23 2015 -0400
Merge topic 'refactor-cmMakefile-properties' into next
97b5de6d Revert "cmMakefile: Don't clear buildsystem properties."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97b5de6df0826cd4d4f706f5df5d11d8cb5137d2
commit 97b5de6df0826cd4d4f706f5df5d11d8cb5137d2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 21 21:11:52 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jul 21 21:11:56 2015 +0200
Revert "cmMakefile: Don't clear buildsystem properties."
This reverts commit 9987717e9a17a802d8dfff27597b946fb7215770.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f0f54e7..a1d9f22 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -275,32 +275,32 @@ void cmMakefile::IssueMessage(cmake::MessageType t,
cmStringRange cmMakefile::GetIncludeDirectoriesEntries() const
{
- return this->StateSnapshot.GetDirectory().GetIncludeDirectoriesEntries();
+ return cmMakeRange(this->IncludeDirectoriesEntries);
}
cmBacktraceRange cmMakefile::GetIncludeDirectoriesBacktraces() const
{
- return this->StateSnapshot.GetDirectory().GetIncludeDirectoriesEntryBacktraces();
+ return cmMakeRange(this->IncludeDirectoriesEntryBacktraces);
}
cmStringRange cmMakefile::GetCompileOptionsEntries() const
{
- return this->StateSnapshot.GetDirectory().GetCompileOptionsEntries();
+ return cmMakeRange(this->CompileOptionsEntries);
}
cmBacktraceRange cmMakefile::GetCompileOptionsBacktraces() const
{
- return this->StateSnapshot.GetDirectory().GetCompileOptionsEntryBacktraces();
+ return cmMakeRange(this->CompileOptionsEntryBacktraces);
}
cmStringRange cmMakefile::GetCompileDefinitionsEntries() const
{
- return this->StateSnapshot.GetDirectory().GetCompileDefinitionsEntries();
+ return cmMakeRange(this->CompileDefinitionsEntries);
}
cmBacktraceRange cmMakefile::GetCompileDefinitionsBacktraces() const
{
- return this->StateSnapshot.GetDirectory().GetCompileDefinitionsEntryBacktraces();
+ return cmMakeRange(this->CompileDefinitionsEntryBacktraces);
}
//----------------------------------------------------------------------------
@@ -1557,7 +1557,32 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent)
this->AddDefinition("CMAKE_CURRENT_BINARY_DIR",
this->GetCurrentBinaryDirectory());
- this->StateSnapshot.InitializeFromParent();
+ 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());
this->SystemIncludeDirectories = parent->SystemIncludeDirectories;
@@ -1901,17 +1926,14 @@ void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs,
return;
}
+ std::vector<std::string>::iterator position =
+ before ? this->IncludeDirectoriesEntries.begin()
+ : this->IncludeDirectoriesEntries.end();
+
cmListFileBacktrace lfbt = this->GetBacktrace();
std::string entryString = cmJoin(incs, ";");
- if (before)
- {
- this->StateSnapshot.GetDirectory().PrependIncludeDirectoriesEntry(entryString, lfbt);
- }
- else
- {
- this->StateSnapshot.GetDirectory().AppendIncludeDirectoriesEntry(entryString, lfbt);
- }
- // Note: Deleted code was not correct. Used push_back with backtraces.
+ this->IncludeDirectoriesEntries.insert(position, entryString);
+ this->IncludeDirectoriesEntryBacktraces.push_back(lfbt);
// Property on each target:
for (cmTargets::iterator l = this->Targets.begin();
@@ -4137,35 +4159,41 @@ void cmMakefile::SetProperty(const std::string& prop, const char* value)
{
if (prop == "INCLUDE_DIRECTORIES")
{
+ this->IncludeDirectoriesEntries.clear();
+ this->IncludeDirectoriesEntryBacktraces.clear();
if (!value)
{
- this->StateSnapshot.GetDirectory().ClearIncludeDirectories();
return;
}
cmListFileBacktrace lfbt = this->GetBacktrace();
- this->StateSnapshot.GetDirectory().SetIncludeDirectories(value, lfbt);
+ this->IncludeDirectoriesEntries.push_back(value);
+ this->IncludeDirectoriesEntryBacktraces.push_back(lfbt);
return;
}
if (prop == "COMPILE_OPTIONS")
{
+ this->CompileOptionsEntries.clear();
+ this->CompileDefinitionsEntryBacktraces.clear();
if (!value)
{
- this->StateSnapshot.GetDirectory().ClearCompileOptions();
return;
}
cmListFileBacktrace lfbt = this->GetBacktrace();
- this->StateSnapshot.GetDirectory().SetCompileOptions(value, lfbt);
+ this->CompileOptionsEntries.push_back(value);
+ this->CompileOptionsEntryBacktraces.push_back(lfbt);
return;
}
if (prop == "COMPILE_DEFINITIONS")
{
+ this->CompileDefinitionsEntries.clear();
+ this->CompileDefinitionsEntryBacktraces.clear();
if (!value)
{
- this->StateSnapshot.GetDirectory().ClearCompileDefinitions();
return;
}
cmListFileBacktrace lfbt = this->GetBacktrace();
- this->StateSnapshot.GetDirectory().SetCompileDefinitions(value, lfbt);
+ this->CompileDefinitionsEntries.push_back(value);
+ this->CompileDefinitionsEntryBacktraces.push_back(lfbt);
return;
}
@@ -4179,19 +4207,22 @@ void cmMakefile::AppendProperty(const std::string& prop,
if (prop == "INCLUDE_DIRECTORIES")
{
cmListFileBacktrace lfbt = this->GetBacktrace();
- this->StateSnapshot.GetDirectory().AppendIncludeDirectoriesEntry(value, lfbt);
+ this->IncludeDirectoriesEntries.push_back(value);
+ this->IncludeDirectoriesEntryBacktraces.push_back(lfbt);
return;
}
if (prop == "COMPILE_OPTIONS")
{
cmListFileBacktrace lfbt = this->GetBacktrace();
- this->StateSnapshot.GetDirectory().AppendCompileOptionsEntry(value, lfbt);
+ this->CompileOptionsEntries.push_back(value);
+ this->CompileOptionsEntryBacktraces.push_back(lfbt);
return;
}
if (prop == "COMPILE_DEFINITIONS")
{
cmListFileBacktrace lfbt = this->GetBacktrace();
- this->StateSnapshot.GetDirectory().AppendCompileDefinitionsEntry(value, lfbt);
+ this->CompileDefinitionsEntries.push_back(value);
+ this->CompileDefinitionsEntryBacktraces.push_back(lfbt);
return;
}
@@ -4246,17 +4277,17 @@ const char *cmMakefile::GetProperty(const std::string& prop,
}
else if (prop == "INCLUDE_DIRECTORIES")
{
- output = cmJoin(this->StateSnapshot.GetDirectory().GetIncludeDirectoriesEntries(), ";");
+ output = cmJoin(this->IncludeDirectoriesEntries, ";");
return output.c_str();
}
else if (prop == "COMPILE_OPTIONS")
{
- output = cmJoin(this->StateSnapshot.GetDirectory().GetCompileOptionsEntries(), ";");
+ output = cmJoin(this->CompileOptionsEntries, ";");
return output.c_str();
}
else if (prop == "COMPILE_DEFINITIONS")
{
- output = cmJoin(this->StateSnapshot.GetDirectory().GetCompileDefinitionsEntries(), ";");
+ output = cmJoin(this->CompileDefinitionsEntries, ";");
return output.c_str();
}
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index c335a33..27911a9 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -846,6 +846,13 @@ 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;
+
// Track the value of the computed DEFINITIONS property.
void AddDefineFlag(const char*, std::string&);
void RemoveDefineFlag(const char*, std::string::size_type, std::string&);
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index ba68939..9cbb841 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -28,9 +28,6 @@ struct cmState::SnapshotDataType
BuildSystemDirectory;
std::string EntryPointCommand;
long EntryPointLine;
- std::vector<std::string>::size_type ThisIncludeDirectoryPosition;
- std::vector<std::string>::size_type ThisCompileDefinitionsPosition;
- std::vector<std::string>::size_type ThisCompileOptionsPosition;
};
struct cmState::BuildsystemDirectoryStateType
@@ -47,15 +44,6 @@ struct cmState::BuildsystemDirectoryStateType
// safely by the build tools.
std::string RelativePathTopSource;
std::string RelativePathTopBinary;
-
- std::vector<std::string> IncludeDirectories;
- std::vector<cmListFileBacktrace> IncludeDirectoryBacktraces;
-
- std::vector<std::string> CompileDefinitions;
- std::vector<cmListFileBacktrace> CompileDefinitionsBacktraces;
-
- std::vector<std::string> CompileOptions;
- std::vector<cmListFileBacktrace> CompileOptionsBacktraces;
};
cmState::cmState(cmake* cm)
@@ -240,15 +228,7 @@ cmState::Snapshot cmState::Reset()
this->GlobalProperties.clear();
this->PropertyDefinitions.clear();
- {
- cmLinkedTree<BuildsystemDirectoryStateType>::iterator it = this->BuildsystemDirectory.Truncate();
- it->IncludeDirectories.clear();
- it->IncludeDirectoryBacktraces.clear();
- it->CompileDefinitions.clear();
- it->CompileDefinitionsBacktraces.clear();
- it->CompileOptions.clear();
- it->CompileOptionsBacktraces.clear();
- }
+ this->BuildsystemDirectory.Truncate();
PositionType pos = this->SnapshotData.Truncate();
this->ExecutionListFiles.Truncate();
@@ -718,9 +698,6 @@ cmState::Snapshot cmState::CreateBaseSnapshot()
this->BuildsystemDirectory.Extend(this->BuildsystemDirectory.Root());
pos->ExecutionListFile =
this->ExecutionListFiles.Extend(this->ExecutionListFiles.Root());
- pos->ThisIncludeDirectoryPosition = 0;
- pos->ThisCompileDefinitionsPosition = 0;
- pos->ThisCompileOptionsPosition = 0;
return cmState::Snapshot(this, pos);
}
@@ -739,9 +716,6 @@ cmState::CreateBuildsystemDirectorySnapshot(Snapshot originSnapshot,
pos->BuildSystemDirectory =
this->BuildsystemDirectory.Extend(
originSnapshot.Position->BuildSystemDirectory);
- pos->ThisIncludeDirectoryPosition = pos->BuildSystemDirectory->IncludeDirectories.size();
- pos->ThisCompileDefinitionsPosition = pos->BuildSystemDirectory->CompileDefinitions.size();
- pos->ThisCompileOptionsPosition = pos->BuildSystemDirectory->CompileOptions.size();
pos->ExecutionListFile =
this->ExecutionListFiles.Extend(
originSnapshot.Position->ExecutionListFile);
@@ -759,9 +733,6 @@ cmState::CreateFunctionCallSnapshot(cmState::Snapshot originSnapshot,
pos->CallStackParent = originSnapshot.Position;
pos->EntryPointLine = entryPointLine;
pos->EntryPointCommand = entryPointCommand;
- pos->ThisIncludeDirectoryPosition = pos->BuildSystemDirectory->IncludeDirectories.size();
- pos->ThisCompileDefinitionsPosition = pos->BuildSystemDirectory->CompileDefinitions.size();
- pos->ThisCompileOptionsPosition = pos->BuildSystemDirectory->CompileOptions.size();
pos->SnapshotType = FunctionCallType;
pos->ExecutionListFile = this->ExecutionListFiles.Extend(
originSnapshot.Position->ExecutionListFile, fileName);
@@ -780,9 +751,6 @@ cmState::CreateMacroCallSnapshot(cmState::Snapshot originSnapshot,
pos->CallStackParent = originSnapshot.Position;
pos->EntryPointLine = entryPointLine;
pos->EntryPointCommand = entryPointCommand;
- pos->ThisIncludeDirectoryPosition = pos->BuildSystemDirectory->IncludeDirectories.size();
- pos->ThisCompileDefinitionsPosition = pos->BuildSystemDirectory->CompileDefinitions.size();
- pos->ThisCompileOptionsPosition = pos->BuildSystemDirectory->CompileOptions.size();
pos->SnapshotType = MacroCallType;
pos->ExecutionListFile = this->ExecutionListFiles.Extend(
originSnapshot.Position->ExecutionListFile, fileName);
@@ -800,9 +768,6 @@ cmState::CreateCallStackSnapshot(cmState::Snapshot originSnapshot,
pos->CallStackParent = originSnapshot.Position;
pos->EntryPointLine = entryPointLine;
pos->EntryPointCommand = entryPointCommand;
- pos->ThisIncludeDirectoryPosition = pos->BuildSystemDirectory->IncludeDirectories.size();
- pos->ThisCompileDefinitionsPosition = pos->BuildSystemDirectory->CompileDefinitions.size();
- pos->ThisCompileOptionsPosition = pos->BuildSystemDirectory->CompileOptions.size();
pos->SnapshotType = CallStackType;
pos->ExecutionListFile = this->ExecutionListFiles.Extend(
originSnapshot.Position->ExecutionListFile, fileName);
@@ -820,9 +785,6 @@ cmState::CreateInlineListFileSnapshot(cmState::Snapshot originSnapshot,
pos->CallStackParent = originSnapshot.Position;
pos->EntryPointLine = entryPointLine;
pos->EntryPointCommand = entryPointCommand;
- pos->ThisIncludeDirectoryPosition = pos->BuildSystemDirectory->IncludeDirectories.size();
- pos->ThisCompileDefinitionsPosition = pos->BuildSystemDirectory->CompileDefinitions.size();
- pos->ThisCompileOptionsPosition = pos->BuildSystemDirectory->CompileOptions.size();
pos->SnapshotType = InlineListFileType;
pos->ExecutionListFile = this->ExecutionListFiles.Extend(
originSnapshot.Position->ExecutionListFile, fileName);
@@ -836,14 +798,8 @@ cmState::Snapshot cmState::Pop(cmState::Snapshot originSnapshot)
++prevPos;
if (prevPos == this->SnapshotData.Root())
{
- prevPos->ThisIncludeDirectoryPosition = prevPos->BuildSystemDirectory->IncludeDirectories.size();
- prevPos->ThisCompileDefinitionsPosition = prevPos->BuildSystemDirectory->CompileDefinitions.size();
- prevPos->ThisCompileOptionsPosition = prevPos->BuildSystemDirectory->CompileOptions.size();
return Snapshot(this, prevPos);
}
- originSnapshot.Position->CallStackParent->ThisIncludeDirectoryPosition = originSnapshot.Position->CallStackParent->BuildSystemDirectory->IncludeDirectories.size();
- originSnapshot.Position->CallStackParent->ThisCompileDefinitionsPosition = originSnapshot.Position->CallStackParent->BuildSystemDirectory->CompileDefinitions.size();
- originSnapshot.Position->CallStackParent->ThisCompileOptionsPosition = originSnapshot.Position->CallStackParent->BuildSystemDirectory->CompileOptions.size();
return Snapshot(this, originSnapshot.Position->CallStackParent);
}
@@ -987,61 +943,6 @@ cmState::Snapshot cmState::Snapshot::GetCallStackParent() const
return snapshot;
}
-template<typename T, typename U, typename V>
-void InitializeContentFromParent(T& parentContent,
- T& thisContent,
- U& parentBacktraces,
- U& thisBacktraces,
- V& contentEndPosition)
-{
- std::vector<std::string>::const_iterator parentBegin =
- parentContent.begin();
- std::vector<std::string>::const_iterator parentEnd =
- parentContent.end();
-
- std::vector<std::string>::const_reverse_iterator parentRbegin =
- std::reverse_iterator<std::vector<std::string>::const_iterator>(parentEnd);
- std::vector<std::string>::const_reverse_iterator parentRend =
- parentContent.rend();
- parentRbegin = std::find(parentRbegin, parentRend, std::string());
- std::vector<std::string>::const_iterator parentIt = parentRbegin.base();
-
- thisContent = std::vector<std::string>(parentIt, parentEnd);
-
- std::vector<cmListFileBacktrace>::const_iterator btIt =
- parentBacktraces.begin();
- std::advance(btIt, std::distance(parentBegin, parentIt));
- std::vector<cmListFileBacktrace>::const_iterator btEnd =
- parentBacktraces.end();
-
- thisBacktraces = std::vector<cmListFileBacktrace>(btIt, btEnd);
-
- contentEndPosition = thisContent.size();
-}
-
-void cmState::Snapshot::InitializeFromParent()
-{
- PositionType parent = this->Position->DirectoryParent;
-
- InitializeContentFromParent(parent->BuildSystemDirectory->IncludeDirectories,
- this->Position->BuildSystemDirectory->IncludeDirectories,
- parent->BuildSystemDirectory->IncludeDirectoryBacktraces,
- this->Position->BuildSystemDirectory->IncludeDirectoryBacktraces,
- this->Position->ThisIncludeDirectoryPosition);
-
- InitializeContentFromParent(parent->BuildSystemDirectory->CompileDefinitions,
- this->Position->BuildSystemDirectory->CompileDefinitions,
- parent->BuildSystemDirectory->CompileDefinitionsBacktraces,
- this->Position->BuildSystemDirectory->CompileDefinitionsBacktraces,
- this->Position->ThisCompileDefinitionsPosition);
-
- InitializeContentFromParent(parent->BuildSystemDirectory->CompileOptions,
- this->Position->BuildSystemDirectory->CompileOptions,
- parent->BuildSystemDirectory->CompileOptionsBacktraces,
- this->Position->BuildSystemDirectory->CompileOptionsBacktraces,
- this->Position->ThisCompileOptionsPosition);
-}
-
cmState* cmState::Snapshot::GetState() const
{
return this->State;
@@ -1059,214 +960,3 @@ cmState::Directory::Directory(
{
}
-
-template <typename T, typename U>
-cmStringRange GetPropertyContent(T const& content, U contentEndPosition)
-{
- std::vector<std::string>::const_iterator end = content.begin();
- std::advance(end, contentEndPosition);
-
- std::vector<std::string>::const_reverse_iterator rbegin =
- std::reverse_iterator<std::vector<std::string>::const_iterator>(end);
- rbegin = std::find(rbegin, content.rend(), std::string());
-
- return cmMakeRange(rbegin.base(), end);
-}
-
-template <typename T, typename U, typename V>
-cmBacktraceRange GetPropertyBacktraces(T const& content,
- U const& backtraces,
- V contentEndPosition)
-{
- std::vector<std::string>::const_iterator entryEnd = content.begin();
- std::advance(entryEnd, contentEndPosition);
-
- std::vector<std::string>::const_reverse_iterator rbegin =
- std::reverse_iterator<std::vector<std::string>::const_iterator>(entryEnd);
- rbegin = std::find(rbegin, content.rend(), std::string());
-
- std::vector<cmListFileBacktrace>::const_iterator it = backtraces.begin();
- std::advance(it, std::distance(content.begin(), rbegin.base()));
-
- std::vector<cmListFileBacktrace>::const_iterator end = backtraces.end();
- return cmMakeRange(it, end);
-}
-
-template <typename T, typename U, typename V>
-void AppendEntry(T& content, U& backtraces, V& endContentPosition,
- const std::string& vec, const cmListFileBacktrace& lfbt)
-{
- assert(endContentPosition == content.size());
-
- content.push_back(vec);
- backtraces.push_back(lfbt);
-
- endContentPosition = content.size();
-}
-
-template <typename T, typename U, typename V>
-void SetContent(T& content, U& backtraces, V& endContentPosition,
- const std::string& vec, const cmListFileBacktrace& lfbt)
-{
- assert(endContentPosition == content.size());
-
- content.resize(content.size() + 2);
- backtraces.resize(backtraces.size() + 2);
-
- content.back() = vec;
- backtraces.back() = lfbt;
-
- endContentPosition = content.size();
-}
-
-template <typename T, typename U, typename V>
-void ClearContent(T& content, U& backtraces, V& endContentPosition)
-{
- assert(endContentPosition == content.size());
-
- content.resize(content.size() + 1);
- backtraces.resize(backtraces.size() + 1);
-
- endContentPosition = content.size();
-}
-
-cmStringRange
-cmState::Directory::GetIncludeDirectoriesEntries() const
-{
- return GetPropertyContent(this->DirectoryState->IncludeDirectories,
- this->Snapshot_.Position->ThisIncludeDirectoryPosition);
-}
-
-cmBacktraceRange
-cmState::Directory::GetIncludeDirectoriesEntryBacktraces() const
-{
- return GetPropertyBacktraces(this->DirectoryState->IncludeDirectories,
- this->DirectoryState->IncludeDirectoryBacktraces,
- this->Snapshot_.Position->ThisIncludeDirectoryPosition);
-}
-
-void cmState::Directory::AppendIncludeDirectoriesEntry(
- const std::string& vec, const cmListFileBacktrace& lfbt)
-{
- AppendEntry(this->DirectoryState->IncludeDirectories,
- this->DirectoryState->IncludeDirectoryBacktraces,
- this->Snapshot_.Position->ThisIncludeDirectoryPosition,
- vec, lfbt);
-}
-
-void cmState::Directory::PrependIncludeDirectoriesEntry(
- const std::string& vec, const cmListFileBacktrace& lfbt)
-{
- std::vector<std::string>::iterator entryEnd =
- this->DirectoryState->IncludeDirectories.begin()
- + this->Snapshot_.Position->ThisIncludeDirectoryPosition;
-
- std::vector<std::string>::const_reverse_iterator rend =
- this->DirectoryState->IncludeDirectories.rend();
- std::vector<std::string>::reverse_iterator rbegin =
- std::reverse_iterator<std::vector<std::string>::iterator>(entryEnd);
- std::vector<std::string>::const_reverse_iterator crbegin = rbegin;
- crbegin = std::find(crbegin, rend, std::string());
-
- std::vector<std::string>::const_iterator entryIt = crbegin.base();
- std::vector<std::string>::const_iterator entryBegin =
- this->DirectoryState->IncludeDirectories.begin();
-
- std::vector<cmListFileBacktrace>::iterator btIt =
- this->DirectoryState->IncludeDirectoryBacktraces.begin()
- + std::distance(entryBegin, entryIt);
-
- this->DirectoryState->IncludeDirectories.insert(rbegin.base(), vec);
- this->DirectoryState->IncludeDirectoryBacktraces.insert(btIt, lfbt);
-
- this->Snapshot_.Position->ThisIncludeDirectoryPosition =
- this->DirectoryState->IncludeDirectories.size();
-}
-
-void cmState::Directory::SetIncludeDirectories(
- const std::string& vec, const cmListFileBacktrace& lfbt)
-{
- SetContent(this->DirectoryState->IncludeDirectories,
- this->DirectoryState->IncludeDirectoryBacktraces,
- this->Snapshot_.Position->ThisIncludeDirectoryPosition,
- vec, lfbt);
-}
-
-void cmState::Directory::ClearIncludeDirectories()
-{
- ClearContent(this->DirectoryState->IncludeDirectories,
- this->DirectoryState->IncludeDirectoryBacktraces,
- this->Snapshot_.Position->ThisIncludeDirectoryPosition);
-}
-
-cmStringRange cmState::Directory::GetCompileDefinitionsEntries() const
-{
- return GetPropertyContent(this->DirectoryState->CompileDefinitions,
- this->Snapshot_.Position->ThisCompileDefinitionsPosition);
-}
-
-cmBacktraceRange cmState::Directory::GetCompileDefinitionsEntryBacktraces() const
-{
- return GetPropertyBacktraces(this->DirectoryState->CompileDefinitions,
- this->DirectoryState->CompileDefinitionsBacktraces,
- this->Snapshot_.Position->ThisCompileDefinitionsPosition);
-}
-
-void cmState::Directory::AppendCompileDefinitionsEntry(const std::string& vec, const cmListFileBacktrace& lfbt)
-{
- AppendEntry(this->DirectoryState->CompileDefinitions,
- this->DirectoryState->CompileDefinitionsBacktraces,
- this->Snapshot_.Position->ThisCompileDefinitionsPosition,
- vec, lfbt);
-}
-
-void cmState::Directory::SetCompileDefinitions(const std::string& vec, const cmListFileBacktrace& lfbt)
-{
- SetContent(this->DirectoryState->CompileDefinitions,
- this->DirectoryState->CompileDefinitionsBacktraces,
- this->Snapshot_.Position->ThisCompileDefinitionsPosition,
- vec, lfbt);
-}
-
-void cmState::Directory::ClearCompileDefinitions()
-{
- ClearContent(this->DirectoryState->CompileDefinitions,
- this->DirectoryState->CompileDefinitionsBacktraces,
- this->Snapshot_.Position->ThisCompileDefinitionsPosition);
-}
-
-cmStringRange cmState::Directory::GetCompileOptionsEntries() const
-{
- return GetPropertyContent(this->DirectoryState->CompileOptions,
- this->Snapshot_.Position->ThisCompileOptionsPosition);
-}
-
-cmBacktraceRange cmState::Directory::GetCompileOptionsEntryBacktraces() const
-{
- return GetPropertyBacktraces(this->DirectoryState->CompileOptions,
- this->DirectoryState->CompileOptionsBacktraces,
- this->Snapshot_.Position->ThisCompileOptionsPosition);
-}
-
-void cmState::Directory::AppendCompileOptionsEntry(const std::string& vec, const cmListFileBacktrace& lfbt)
-{
- AppendEntry(this->DirectoryState->CompileOptions,
- this->DirectoryState->CompileOptionsBacktraces,
- this->Snapshot_.Position->ThisCompileOptionsPosition,
- vec, lfbt);
-}
-
-void cmState::Directory::SetCompileOptions(const std::string& vec, const cmListFileBacktrace& lfbt)
-{
- SetContent(this->DirectoryState->CompileOptions,
- this->DirectoryState->CompileOptionsBacktraces,
- this->Snapshot_.Position->ThisCompileOptionsPosition,
- vec, lfbt);
-}
-
-void cmState::Directory::ClearCompileOptions()
-{
- ClearContent(this->DirectoryState->CompileOptions,
- this->DirectoryState->CompileOptionsBacktraces,
- this->Snapshot_.Position->ThisCompileOptionsPosition);
-}
diff --git a/Source/cmState.h b/Source/cmState.h
index 2e7310f..acd23a5 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -16,7 +16,6 @@
#include "cmPropertyDefinitionMap.h"
#include "cmPropertyMap.h"
#include "cmLinkedTree.h"
-#include "cmAlgorithms.h"
class cmake;
class cmCommand;
@@ -56,8 +55,6 @@ public:
Snapshot GetBuildsystemDirectoryParent() const;
Snapshot GetCallStackParent() const;
- void InitializeFromParent();
-
cmState* GetState() const;
Directory GetDirectory() const;
@@ -89,32 +86,6 @@ public:
void SetRelativePathTopSource(const char* dir);
void SetRelativePathTopBinary(const char* dir);
- cmStringRange GetIncludeDirectoriesEntries() const;
- cmBacktraceRange GetIncludeDirectoriesEntryBacktraces() const;
- void AppendIncludeDirectoriesEntry(std::string const& vec,
- cmListFileBacktrace const& lfbt);
- void PrependIncludeDirectoriesEntry(std::string const& vec,
- cmListFileBacktrace const& lfbt);
- void SetIncludeDirectories(std::string const& vec,
- cmListFileBacktrace const& lfbt);
- void ClearIncludeDirectories();
-
- cmStringRange GetCompileDefinitionsEntries() const;
- cmBacktraceRange GetCompileDefinitionsEntryBacktraces() const;
- void AppendCompileDefinitionsEntry(std::string const& vec,
- cmListFileBacktrace const& lfbt);
- void SetCompileDefinitions(std::string const& vec,
- cmListFileBacktrace const& lfbt);
- void ClearCompileDefinitions();
-
- cmStringRange GetCompileOptionsEntries() const;
- cmBacktraceRange GetCompileOptionsEntryBacktraces() const;
- void AppendCompileOptionsEntry(std::string const& vec,
- cmListFileBacktrace const& lfbt);
- void SetCompileOptions(std::string const& vec,
- cmListFileBacktrace const& lfbt);
- void ClearCompileOptions();
-
private:
void ComputeRelativePathTopSource();
void ComputeRelativePathTopBinary();
-----------------------------------------------------------------------
Summary of changes:
Source/cmMakefile.cxx | 87 +++++++++-----
Source/cmMakefile.h | 7 ++
Source/cmState.cxx | 312 +------------------------------------------------
Source/cmState.h | 29 -----
4 files changed, 67 insertions(+), 368 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list