[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-553-gfddd061

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  fddd06191565ba067f82b0baa6f33beabe78ccab (commit)
       via  e6ec80ae7c193b318b02c30f7a8f0355635ee170 (commit)
      from  f014b3408a942ed1be8e0bbe7767ec8e6f092f5f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fddd06191565ba067f82b0baa6f33beabe78ccab
commit fddd06191565ba067f82b0baa6f33beabe78ccab
Merge: f014b34 e6ec80a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 17 10:06:12 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 17 10:06:12 2016 -0400

    Merge topic 'refactor-folder-name-retrieval' into next
    
    e6ec80ae fixup! Refactor IDE folder name retrieval into GetEffectiveFolderName()


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6ec80ae7c193b318b02c30f7a8f0355635ee170
commit e6ec80ae7c193b318b02c30f7a8f0355635ee170
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 17 10:05:58 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 17 10:05:58 2016 -0400

    fixup! Refactor IDE folder name retrieval into GetEffectiveFolderName()

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index eb9f419..f11149a 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1769,18 +1769,18 @@ std::string cmGeneratorTarget::GetMacContentDirectory(
 
 std::string cmGeneratorTarget::GetEffectiveFolderName() const
 {
-    std::string effectiveFolder;
+  std::string effectiveFolder;
 
-    if (!this->GlobalGenerator->UseFolderProperty()) {
-        return effectiveFolder;
-    }
+  if (!this->GlobalGenerator->UseFolderProperty()) {
+    return effectiveFolder;
+  }
 
-    const char* targetFolder = this->GetProperty("FOLDER");
-    if (targetFolder) {
-        effectiveFolder += targetFolder;
-    }
+  const char* targetFolder = this->GetProperty("FOLDER");
+  if (targetFolder) {
+    effectiveFolder += targetFolder;
+  }
 
-    return effectiveFolder;
+  return effectiveFolder;
 }
 
 cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo(

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGeneratorTarget.cxx |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake