kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2013-12-05 09:25:34 -05:00 committed by CMake Topic Stage
parent 520ead7200 259bf0918c
commit 998d7c8f4a
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst
View File

@ -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.

3
Source/cmGeneratorTarget.cxx
View File

@ -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)

2
Source/cmGeneratorTarget.h
View File

@ -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*,

2
Source/cmTarget.cxx
View File

@ -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;
}