From 1396ab80095f8f63702621b58e2ecc670203cc2f Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 3 Dec 2013 11:13:42 +0100 Subject: Don't generate self-references for system include directories. Targets which link directly to themselves should not result in generate-time errors (reported by the DAG checker). Self-links are handled separately with policy CMP0038. --- Source/cmTarget.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- cgit v0.12 From 8cc3cdb6142093ecb9c5aa8c1866ed47a903ea79 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 3 Dec 2013 11:19:07 +0100 Subject: Help: Fix up the VISIBILITY_INLINES_HIDDEN docs. Resolve some sentence fragments, remove a copy-pasto from other docs and use a link to the CMAKE_VISIBILITY_INLINES_HIDDEN variable. --- Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 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. -- cgit v0.12 From 259bf0918cfbfbbeaf9078001c0b1010066666a1 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 4 Dec 2013 13:35:39 +0100 Subject: Make the cmStrictTargetComparison operate on const cmTarget*. --- Source/cmGeneratorTarget.cxx | 3 ++- Source/cmGeneratorTarget.h | 2 +- 2 files changed, 3 insertions(+), 2 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