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

Merge topic 'fix-style' 

3c7c332 Fix brace indentation.
c70b9b5 Fix style.
This commit is contained in:
Brad King 2013-05-21 15:13:49 -04:00 committed by CMake Topic Stage
parent ad2391b94f 3c7c332929
commit 1dbf0aac1b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmCacheManager.h
View File

@ -82,7 +82,7 @@ public:
{ {
this->Find(key); this->Find(key);
} }
} }
private: private:
CacheEntry const& GetEntry() const { return this->Position->second; } CacheEntry const& GetEntry() const { return this->Position->second; }
CacheEntry& GetEntry() { return this->Position->second; } CacheEntry& GetEntry() { return this->Position->second; }

4
Source/cmLocalGenerator.cxx
View File

@ -2011,13 +2011,13 @@ void cmLocalGenerator::AddCMP0018Flags(std::string &flags, cmTarget* target,
else else
{ {
if (target->GetType() == cmTarget::OBJECT_LIBRARY) if (target->GetType() == cmTarget::OBJECT_LIBRARY)
{ {
if (target->GetPropertyAsBool("POSITION_INDEPENDENT_CODE")) if (target->GetPropertyAsBool("POSITION_INDEPENDENT_CODE"))
{ {
this->AddPositionIndependentFlags(flags, lang, targetType); this->AddPositionIndependentFlags(flags, lang, targetType);
} }
return; return;
} }
if (target->GetLinkInterfaceDependentBoolProperty( if (target->GetLinkInterfaceDependentBoolProperty(
"POSITION_INDEPENDENT_CODE", "POSITION_INDEPENDENT_CODE",

2
Source/cmTarget.cxx
View File

@ -180,7 +180,7 @@ void deleteAndClear(
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
cmTargetInternals::~cmTargetInternals() cmTargetInternals::~cmTargetInternals()
{ {
deleteAndClear(CachedLinkInterfaceIncludeDirectoriesEntries); deleteAndClear(this->CachedLinkInterfaceIncludeDirectoriesEntries);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------