diff options
| author | Brad King <brad.king@kitware.com> | 2013-05-21 19:13:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-05-21 19:13:49 (GMT) |
| commit | 1dbf0aac1bdb6cf47f4efc6c155078f9c6a7a602 (patch) | |
| tree | 6335c10bf67e41f461b2761f91bfb4c460c69946 /Source | |
| parent | ad2391b94f69d8896f152e2cee063f7a0f92b968 (diff) | |
| parent | 3c7c33292966a5bb35c6ff5a16aa10ccf643838a (diff) | |
| download | CMake-1dbf0aac1bdb6cf47f4efc6c155078f9c6a7a602.zip CMake-1dbf0aac1bdb6cf47f4efc6c155078f9c6a7a602.tar.gz CMake-1dbf0aac1bdb6cf47f4efc6c155078f9c6a7a602.tar.bz2 | |
Merge topic 'fix-style'
3c7c332 Fix brace indentation.
c70b9b5 Fix style.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCacheManager.h | 2 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h index 4a5ee45..a5e5eee 100644 --- a/Source/cmCacheManager.h +++ b/Source/cmCacheManager.h @@ -82,7 +82,7 @@ public: { this->Find(key); } - } + } private: CacheEntry const& GetEntry() const { return this->Position->second; } CacheEntry& GetEntry() { return this->Position->second; } diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 69fb4d8..c07653f 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2011,13 +2011,13 @@ void cmLocalGenerator::AddCMP0018Flags(std::string &flags, cmTarget* target, else { if (target->GetType() == cmTarget::OBJECT_LIBRARY) - { + { if (target->GetPropertyAsBool("POSITION_INDEPENDENT_CODE")) { this->AddPositionIndependentFlags(flags, lang, targetType); } return; - } + } if (target->GetLinkInterfaceDependentBoolProperty( "POSITION_INDEPENDENT_CODE", diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index e0807a8..f5f6a90 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -180,7 +180,7 @@ void deleteAndClear( //---------------------------------------------------------------------------- cmTargetInternals::~cmTargetInternals() { - deleteAndClear(CachedLinkInterfaceIncludeDirectoriesEntries); + deleteAndClear(this->CachedLinkInterfaceIncludeDirectoriesEntries); } //---------------------------------------------------------------------------- |