diff options
| -rw-r--r-- | Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst | 10 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 3 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.h | 2 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst b/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst index 3754410..e06d35c 100644 --- a/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst +++ b/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst @@ -4,8 +4,8 @@ VISIBILITY_INLINES_HIDDEN Whether to add a compile flag to hide symbols of inline functions The VISIBILITY_INLINES_HIDDEN property determines whether a flag for -hiding symbols for inline functions. the value passed used in a -visibility related compile option, such as -fvisibility=. This -property only has an affect for libraries and executables with -exports. This property is initialized by the value of the variable -CMAKE_VISIBILITY_INLINES_HIDDEN if it is set when a target is created. +hiding symbols for inline functions, such as -fvisibility-inlines-hidden, +should be used when invoking the compiler. This property only has an affect +for libraries and executables with exports. This property is initialized by +the value of the :variable:`CMAKE_VISIBILITY_INLINES_HIDDEN` if it is set +when a target is created. 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; } |