diff options
author | Sebastian Holtermann <sebholt@xwmw.org> | 2019-05-23 10:52:36 (GMT) |
---|---|---|
committer | Sebastian Holtermann <sebholt@xwmw.org> | 2019-05-23 11:00:33 (GMT) |
commit | 7b4b61a4d38e4c7fe3fe992a6263d8d1f0785858 (patch) | |
tree | f43eaa67777164ce5ba0dda2f381e35260d06b50 /Source/cmMakefile.cxx | |
parent | 22d58e07e5dc54e113ae7414dea604549b0cfc43 (diff) | |
download | CMake-7b4b61a4d38e4c7fe3fe992a6263d8d1f0785858.zip CMake-7b4b61a4d38e4c7fe3fe992a6263d8d1f0785858.tar.gz CMake-7b4b61a4d38e4c7fe3fe992a6263d8d1f0785858.tar.bz2 |
cmMakefile: Define cmTargetMap type in cmMakefile instead of cmTarget
The `cmTargetMap` type is only used in the context of `cmMakefile`.
Therefore it is the most appropriate place to declare it.
This moves the `cmTarget.h/cmTargets` type definition to
`cmMakefile::cmTargetMap`.
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r-- | Source/cmMakefile.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index ca5f009..7d0e318 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -818,7 +818,7 @@ void cmMakefile::AddCustomCommandToTarget( bool command_expand_lists, ObjectLibraryCommands objLibraryCommands) { // Find the target to which to add the custom command. - cmTargets::iterator ti = this->Targets.find(target); + cmTargetMap::iterator ti = this->Targets.find(target); if (ti == this->Targets.end()) { MessageType messageType = MessageType::AUTHOR_WARNING; @@ -1099,7 +1099,7 @@ void cmMakefile::AddCustomCommandOldStyle( // then add the source to the target to make sure the rule is // included. if (sf && !sf->GetPropertyAsBool("__CMAKE_RULE")) { - cmTargets::iterator ti = this->Targets.find(target); + cmTargetMap::iterator ti = this->Targets.find(target); if (ti != this->Targets.end()) { ti->second.AddSource(sf->GetFullPath()); } else { @@ -2036,7 +2036,7 @@ cmTarget* cmMakefile::AddExecutable(const std::string& exeName, cmTarget* cmMakefile::AddNewTarget(cmStateEnums::TargetType type, const std::string& name) { - cmTargets::iterator it = + cmTargetMap::iterator it = this->Targets .emplace(name, cmTarget(name, type, cmTarget::VisibilityNormal, this)) .first; @@ -3888,7 +3888,7 @@ std::vector<std::string> cmMakefile::GetPropertyKeys() const cmTarget* cmMakefile::FindLocalNonAliasTarget(const std::string& name) const { - cmTargets::iterator i = this->Targets.find(name); + cmTargetMap::iterator i = this->Targets.find(name); if (i != this->Targets.end()) { return &i->second; } |