kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmState: remove unused code 

Remove the code that was used by cmOutputConverter exclusively.
This commit is contained in:
Daniel Pfeifer 2016-06-16 23:15:03 +02:00 committed by Stephen Kelly
parent 8d47a20f13
commit 6afd35b98a
2 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Source/cmState.cxx
View File

@ -77,8 +77,6 @@ struct cmState::BuildsystemDirectoryStateType
std::string Location; std::string Location;
std::string OutputLocation; std::string OutputLocation;
std::vector<std::string> CurrentSourceDirectoryComponents;
std::vector<std::string> CurrentBinaryDirectoryComponents;
// The top-most directories for relative path conversion. Both the // The top-most directories for relative path conversion. Both the
// source and destination location of a relative path conversion // source and destination location of a relative path conversion
// must be underneath one of these directories (both under source or // must be underneath one of these directories (both under source or
@ -591,10 +589,6 @@ void cmState::SetSourceDirectory(std::string const& sourceDirectory)
{ {
this->SourceDirectory = sourceDirectory; this->SourceDirectory = sourceDirectory;
cmSystemTools::ConvertToUnixSlashes(this->SourceDirectory); cmSystemTools::ConvertToUnixSlashes(this->SourceDirectory);
cmSystemTools::SplitPath(
cmSystemTools::CollapseFullPath(this->SourceDirectory),
this->SourceDirectoryComponents);
} }
const char* cmState::GetSourceDirectory() const const char* cmState::GetSourceDirectory() const
@ -602,19 +596,10 @@ const char* cmState::GetSourceDirectory() const
return this->SourceDirectory.c_str(); return this->SourceDirectory.c_str();
} }
std::vector<std::string> const& cmState::GetSourceDirectoryComponents() const
{
return this->SourceDirectoryComponents;
}
void cmState::SetBinaryDirectory(std::string const& binaryDirectory) void cmState::SetBinaryDirectory(std::string const& binaryDirectory)
{ {
this->BinaryDirectory = binaryDirectory; this->BinaryDirectory = binaryDirectory;
cmSystemTools::ConvertToUnixSlashes(this->BinaryDirectory); cmSystemTools::ConvertToUnixSlashes(this->BinaryDirectory);
cmSystemTools::SplitPath(
cmSystemTools::CollapseFullPath(this->BinaryDirectory),
this->BinaryDirectoryComponents);
} }
void cmState::SetWindowsShell(bool windowsShell) void cmState::SetWindowsShell(bool windowsShell)
@ -692,11 +677,6 @@ const char* cmState::GetBinaryDirectory() const
return this->BinaryDirectory.c_str(); return this->BinaryDirectory.c_str();
} }
std::vector<std::string> const& cmState::GetBinaryDirectoryComponents() const
{
return this->BinaryDirectoryComponents;
}
void cmState::Directory::ComputeRelativePathTopSource() void cmState::Directory::ComputeRelativePathTopSource()
{ {
// Relative path conversion inside the source tree is not used to // Relative path conversion inside the source tree is not used to
@ -978,8 +958,6 @@ void cmState::Directory::SetCurrentSource(std::string const& dir)
cmSystemTools::ConvertToUnixSlashes(loc); cmSystemTools::ConvertToUnixSlashes(loc);
loc = cmSystemTools::CollapseFullPath(loc); loc = cmSystemTools::CollapseFullPath(loc);
cmSystemTools::SplitPath(
loc, this->DirectoryState->CurrentSourceDirectoryComponents);
this->ComputeRelativePathTopSource(); this->ComputeRelativePathTopSource();
this->Snapshot_.SetDefinition("CMAKE_CURRENT_SOURCE_DIR", loc); this->Snapshot_.SetDefinition("CMAKE_CURRENT_SOURCE_DIR", loc);
@ -997,8 +975,6 @@ void cmState::Directory::SetCurrentBinary(std::string const& dir)
cmSystemTools::ConvertToUnixSlashes(loc); cmSystemTools::ConvertToUnixSlashes(loc);
loc = cmSystemTools::CollapseFullPath(loc); loc = cmSystemTools::CollapseFullPath(loc);
cmSystemTools::SplitPath(
loc, this->DirectoryState->CurrentBinaryDirectoryComponents);
this->ComputeRelativePathTopBinary(); this->ComputeRelativePathTopBinary();
this->Snapshot_.SetDefinition("CMAKE_CURRENT_BINARY_DIR", loc); this->Snapshot_.SetDefinition("CMAKE_CURRENT_BINARY_DIR", loc);
@ -1009,18 +985,6 @@ void cmState::Snapshot::SetListFile(const std::string& listfile)
*this->Position->ExecutionListFile = listfile; *this->Position->ExecutionListFile = listfile;
} }
std::vector<std::string> const&
cmState::Directory::GetCurrentSourceComponents() const
{
return this->DirectoryState->CurrentSourceDirectoryComponents;
}
std::vector<std::string> const&
cmState::Directory::GetCurrentBinaryComponents() const
{
return this->DirectoryState->CurrentBinaryDirectoryComponents;
}
const char* cmState::Directory::GetRelativePathTopSource() const const char* cmState::Directory::GetRelativePathTopSource() const
{ {
return this->DirectoryState->RelativePathTopSource.c_str(); return this->DirectoryState->RelativePathTopSource.c_str();

8
Source/cmState.h
View File

@ -135,9 +135,6 @@ public:
const char* GetCurrentBinary() const; const char* GetCurrentBinary() const;
void SetCurrentBinary(std::string const& dir); void SetCurrentBinary(std::string const& dir);
std::vector<std::string> const& GetCurrentSourceComponents() const;
std::vector<std::string> const& GetCurrentBinaryComponents() const;
const char* GetRelativePathTopSource() const; const char* GetRelativePathTopSource() const;
const char* GetRelativePathTopBinary() const; const char* GetRelativePathTopBinary() const;
void SetRelativePathTopSource(const char* dir); void SetRelativePathTopSource(const char* dir);
@ -312,9 +309,6 @@ public:
const char* GetBinaryDirectory() const; const char* GetBinaryDirectory() const;
void SetBinaryDirectory(std::string const& binaryDirectory); void SetBinaryDirectory(std::string const& binaryDirectory);
std::vector<std::string> const& GetSourceDirectoryComponents() const;
std::vector<std::string> const& GetBinaryDirectoryComponents() const;
void SetWindowsShell(bool windowsShell); void SetWindowsShell(bool windowsShell);
bool UseWindowsShell() const; bool UseWindowsShell() const;
void SetWindowsVSIDE(bool windowsVSIDE); void SetWindowsVSIDE(bool windowsVSIDE);
@ -350,8 +344,6 @@ private:
cmLinkedTree<SnapshotDataType> SnapshotData; cmLinkedTree<SnapshotDataType> SnapshotData;
cmLinkedTree<cmDefinitions> VarTree; cmLinkedTree<cmDefinitions> VarTree;
std::vector<std::string> SourceDirectoryComponents;
std::vector<std::string> BinaryDirectoryComponents;
std::string SourceDirectory; std::string SourceDirectory;
std::string BinaryDirectory; std::string BinaryDirectory;
bool IsInTryCompile; bool IsInTryCompile;