diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-07-18 17:11:05 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-07-18 17:37:58 (GMT) |
| commit | 9ebc7502b2e4cf991e721b695aead2c366eb0bef (patch) | |
| tree | fc15903bb08ee8a4a8006c30d170cd2ec7d09cb1 /Source/cmLocalUnixMakefileGenerator3.cxx | |
| parent | 27ec21dbb2370ac71aebc0089d4269f27661f4b8 (diff) | |
| download | CMake-9ebc7502b2e4cf991e721b695aead2c366eb0bef.zip CMake-9ebc7502b2e4cf991e721b695aead2c366eb0bef.tar.gz CMake-9ebc7502b2e4cf991e721b695aead2c366eb0bef.tar.bz2 | |
cmState: Extract a Directory class.
Move Directory-scoped state accessors to it. This will be expanded
with directory property state soon.
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 5d17a40..fa80222 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -530,10 +530,10 @@ void cmLocalUnixMakefileGenerator3::WriteDirectoryInformationFile() infoFileStream << "# Relative path conversion top directories.\n" << "set(CMAKE_RELATIVE_PATH_TOP_SOURCE \"" - << this->StateSnapshot.GetRelativePathTopSource() + << this->StateSnapshot.GetDirectory().GetRelativePathTopSource() << "\")\n" << "set(CMAKE_RELATIVE_PATH_TOP_BINARY \"" - << this->StateSnapshot.GetRelativePathTopBinary() + << this->StateSnapshot.GetDirectory().GetRelativePathTopBinary() << "\")\n" << "\n"; @@ -1602,12 +1602,14 @@ cmLocalUnixMakefileGenerator3 if(const char* relativePathTopSource = mf->GetDefinition("CMAKE_RELATIVE_PATH_TOP_SOURCE")) { - this->StateSnapshot.SetRelativePathTopSource(relativePathTopSource); + this->StateSnapshot.GetDirectory() + .SetRelativePathTopSource(relativePathTopSource); } if(const char* relativePathTopBinary = mf->GetDefinition("CMAKE_RELATIVE_PATH_TOP_BINARY")) { - this->StateSnapshot.SetRelativePathTopBinary(relativePathTopBinary); + this->StateSnapshot.GetDirectory() + .SetRelativePathTopBinary(relativePathTopBinary); } } else |