summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Holtermann <sebholt@xwmw.org>2019-03-23 16:18:41 +0100
committerSebastian Holtermann <sebholt@xwmw.org>2019-03-23 21:45:10 +0100
commitccf76c6e4cfd9fc7b04db099f7e165cda2336096 (patch)
tree66b9e41b3ab0273f4d6bf545ae5c80ed0dbe2ade
parent7742bf4ff5180f85bc4401745e11ce6e031f32e7 (diff)
downloadcmake-ccf76c6e4cfd9fc7b04db099f7e165cda2336096.tar.gz
cmTarget: Move member `TLLCommands` to impl
-rw-r--r--Source/cmTarget.cxx12
-rw-r--r--Source/cmTarget.h1
2 files changed, 7 insertions, 6 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index d3b2e1d1c6..6dd78870fd 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -188,6 +188,8 @@ public:
std::vector<cmListFileBacktrace> LinkDirectoriesBacktraces;
std::vector<std::string> LinkImplementationPropertyEntries;
std::vector<cmListFileBacktrace> LinkImplementationPropertyBacktraces;
+ std::vector<std::pair<cmTarget::TLLSignature, cmListFileContext>>
+ TLLCommands;
cmListFileBacktrace Backtrace;
};
@@ -738,13 +740,13 @@ bool cmTarget::PushTLLCommandTrace(TLLSignature signature,
cmListFileContext const& lfc)
{
bool ret = true;
- if (!this->TLLCommands.empty()) {
- if (this->TLLCommands.back().first != signature) {
+ if (!impl->TLLCommands.empty()) {
+ if (impl->TLLCommands.back().first != signature) {
ret = false;
}
}
- if (this->TLLCommands.empty() || this->TLLCommands.back().second != lfc) {
- this->TLLCommands.emplace_back(signature, lfc);
+ if (impl->TLLCommands.empty() || impl->TLLCommands.back().second != lfc) {
+ impl->TLLCommands.emplace_back(signature, lfc);
}
return ret;
}
@@ -755,7 +757,7 @@ void cmTarget::GetTllSignatureTraces(std::ostream& s, TLLSignature sig) const
(sig == cmTarget::KeywordTLLSignature ? "keyword" : "plain");
s << "The uses of the " << sigString << " signature are here:\n";
cmStateDirectory cmDir = impl->Makefile->GetStateSnapshot().GetDirectory();
- for (auto const& cmd : this->TLLCommands) {
+ for (auto const& cmd : impl->TLLCommands) {
if (cmd.first == sig) {
cmListFileContext lfc = cmd.second;
lfc.FilePath = cmDir.ConvertToRelPathIfNotContained(
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 8b51c9384e..860a18ef9f 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -303,7 +303,6 @@ private:
std::vector<cmCustomCommand> PreBuildCommands;
std::vector<cmCustomCommand> PreLinkCommands;
std::vector<cmCustomCommand> PostBuildCommands;
- std::vector<std::pair<TLLSignature, cmListFileContext>> TLLCommands;
cmTargetInternalPointer impl;
bool HaveInstallRule;
bool DLLPlatform;