diff options
| -rw-r--r-- | Source/cmState.cxx | 36 | ||||
| -rw-r--r-- | Source/cmState.h | 8 |
2 files changed, 0 insertions, 44 deletions
diff --git a/Source/cmState.cxx b/Source/cmState.cxx index 073c239..ffb104b 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -77,8 +77,6 @@ struct cmState::BuildsystemDirectoryStateType std::string Location; std::string OutputLocation; - std::vector<std::string> CurrentSourceDirectoryComponents; - std::vector<std::string> CurrentBinaryDirectoryComponents; // The top-most directories for relative path conversion. Both the // source and destination location of a relative path conversion // 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; cmSystemTools::ConvertToUnixSlashes(this->SourceDirectory); - - cmSystemTools::SplitPath( - cmSystemTools::CollapseFullPath(this->SourceDirectory), - this->SourceDirectoryComponents); } const char* cmState::GetSourceDirectory() const @@ -602,19 +596,10 @@ const char* cmState::GetSourceDirectory() const return this->SourceDirectory.c_str(); } -std::vector<std::string> const& cmState::GetSourceDirectoryComponents() const -{ - return this->SourceDirectoryComponents; -} - void cmState::SetBinaryDirectory(std::string const& binaryDirectory) { this->BinaryDirectory = binaryDirectory; cmSystemTools::ConvertToUnixSlashes(this->BinaryDirectory); - - cmSystemTools::SplitPath( - cmSystemTools::CollapseFullPath(this->BinaryDirectory), - this->BinaryDirectoryComponents); } void cmState::SetWindowsShell(bool windowsShell) @@ -692,11 +677,6 @@ const char* cmState::GetBinaryDirectory() const return this->BinaryDirectory.c_str(); } -std::vector<std::string> const& cmState::GetBinaryDirectoryComponents() const -{ - return this->BinaryDirectoryComponents; -} - void cmState::Directory::ComputeRelativePathTopSource() { // 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); loc = cmSystemTools::CollapseFullPath(loc); - cmSystemTools::SplitPath( - loc, this->DirectoryState->CurrentSourceDirectoryComponents); this->ComputeRelativePathTopSource(); this->Snapshot_.SetDefinition("CMAKE_CURRENT_SOURCE_DIR", loc); @@ -997,8 +975,6 @@ void cmState::Directory::SetCurrentBinary(std::string const& dir) cmSystemTools::ConvertToUnixSlashes(loc); loc = cmSystemTools::CollapseFullPath(loc); - cmSystemTools::SplitPath( - loc, this->DirectoryState->CurrentBinaryDirectoryComponents); this->ComputeRelativePathTopBinary(); this->Snapshot_.SetDefinition("CMAKE_CURRENT_BINARY_DIR", loc); @@ -1009,18 +985,6 @@ void cmState::Snapshot::SetListFile(const std::string& 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 { return this->DirectoryState->RelativePathTopSource.c_str(); diff --git a/Source/cmState.h b/Source/cmState.h index 9ab4213..0fac42c 100644 --- a/Source/cmState.h +++ b/Source/cmState.h @@ -135,9 +135,6 @@ public: const char* GetCurrentBinary() const; 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* GetRelativePathTopBinary() const; void SetRelativePathTopSource(const char* dir); @@ -312,9 +309,6 @@ public: const char* GetBinaryDirectory() const; void SetBinaryDirectory(std::string const& binaryDirectory); - std::vector<std::string> const& GetSourceDirectoryComponents() const; - std::vector<std::string> const& GetBinaryDirectoryComponents() const; - void SetWindowsShell(bool windowsShell); bool UseWindowsShell() const; void SetWindowsVSIDE(bool windowsVSIDE); @@ -350,8 +344,6 @@ private: cmLinkedTree<SnapshotDataType> SnapshotData; cmLinkedTree<cmDefinitions> VarTree; - std::vector<std::string> SourceDirectoryComponents; - std::vector<std::string> BinaryDirectoryComponents; std::string SourceDirectory; std::string BinaryDirectory; bool IsInTryCompile; |