Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-15 20:46:37 +08:00
Code Issues Projects Releases Wiki Activity

cmTarget: Implement GetProperty in terms of cmState::Snapshot

Browse Source
This commit is contained in:
Stephen Kelly
2016-10-13 00:18:26 +02:00
parent 0d57b07ad9
commit cef59bb8ba
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmTarget.cxx
View File

@@ -1222,10 +1222,16 @@ const char* cmTarget::GetProperty(const std::string& prop) const
return this->GetName().c_str();
}
if (prop == propBINARY_DIR) {
return this->GetMakefile()->GetCurrentBinaryDirectory();
return this->GetMakefile()
->GetStateSnapshot()
.GetDirectory()
.GetCurrentBinary();
}
if (prop == propSOURCE_DIR) {
return this->GetMakefile()->GetCurrentSourceDirectory();
return this->GetMakefile()
->GetStateSnapshot()
.GetDirectory()
.GetCurrentSource();
}
}
@@ -1234,7 +1240,8 @@ const char* cmTarget::GetProperty(const std::string& prop) const
const bool chain = this->GetMakefile()->GetState()->IsPropertyChained(
prop, cmProperty::TARGET);
if (chain) {
return this->Makefile->GetProperty(prop, chain);
return this->Makefile->GetStateSnapshot().GetDirectory().GetProperty(
prop, chain);
}
}
return retVal;