diff options
| author | Brad King <brad.king@kitware.com> | 2013-12-05 14:25:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-12-05 14:25:34 (GMT) |
| commit | 998d7c8f4af27346aab11dfc89a9432d277de676 (patch) | |
| tree | 3c7fab6b39ce28506b916947300c657782ef3d5f /Source | |
| parent | 520ead7200334fddcbef94c657de025abe5cf134 (diff) | |
| parent | 259bf0918cfbfbbeaf9078001c0b1010066666a1 (diff) | |
| download | CMake-998d7c8f4af27346aab11dfc89a9432d277de676.zip CMake-998d7c8f4af27346aab11dfc89a9432d277de676.tar.gz CMake-998d7c8f4af27346aab11dfc89a9432d277de676.tar.bz2 | |
Merge topic 'minor-cleanups'
259bf09 Make the cmStrictTargetComparison operate on const cmTarget*.
8cc3cdb Help: Fix up the VISIBILITY_INLINES_HIDDEN docs.
1396ab8 Don't generate self-references for system include directories.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 3 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.h | 2 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 5a535c7..fdd4e6d 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -693,7 +693,8 @@ void cmGeneratorTarget::GenerateTargetManifest(const char* config) const } } -bool cmStrictTargetComparison::operator()(cmTarget *t1, cmTarget *t2) const +bool cmStrictTargetComparison::operator()(cmTarget const* t1, + cmTarget const* t2) const { int nameResult = strcmp(t1->GetName(), t2->GetName()); if (nameResult == 0) diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index d2b65b2..6aff5f0 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -101,7 +101,7 @@ private: }; struct cmStrictTargetComparison { - bool operator()(cmTarget *t1, cmTarget *t2) const; + bool operator()(cmTarget const* t1, cmTarget const* t2) const; }; typedef std::map<cmTarget*, diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index fe68a8a..8e4ce8b 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -1063,7 +1063,7 @@ void cmTarget::FinalizeSystemIncludeDirectories() std::string targetName = cge->Evaluate(this->Makefile, 0, false, this, 0, 0); cmTarget *tgt = this->Makefile->FindTargetToUse(targetName.c_str()); - if (!tgt) + if (!tgt || tgt == this) { continue; } |