[Cmake-commits] CMake branch, next, updated. v2.8.8-2648-gf31998d

[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  f31998df5aa0c8f30d26ece1d9a3863e5b3c1a64 (commit)
       via  b8034104c112a618df73f1cb104b1d09e8492d66 (commit)
      from  86f0f29eb9b1bbcbaf1875b42489a550195bd84c (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f31998df5aa0c8f30d26ece1d9a3863e5b3c1a64
commit f31998df5aa0c8f30d26ece1d9a3863e5b3c1a64
Merge: 86f0f29 b803410
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 19 10:10:28 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 19 10:10:28 2012 -0400

    Merge topic 'enhance-include_external_msproject' into next
    
    b803410 VS: Fix line-too-long style errors


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8034104c112a618df73f1cb104b1d09e8492d66
commit b8034104c112a618df73f1cb104b1d09e8492d66
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 19 10:06:59 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 19 10:07:49 2012 -0400

    VS: Fix line-too-long style errors
    
    Commit 59139031 (include_external_msproject: Add TYPE, GUID, PLATFORM
    options, 2012-04-16) introduced some long lines.  Wrap them.

diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 11bccde..d6b653c 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -282,7 +282,8 @@ void cmGlobalVisualStudio71Generator
 // executables to the libraries it uses are also done here
 void cmGlobalVisualStudio71Generator
 ::WriteProjectConfigurations(std::ostream& fout, const char* name,
-                             bool partOfDefaultBuild, const char* platformMapping)
+                             bool partOfDefaultBuild,
+                             const char* platformMapping)
 {
   std::string guid = this->GetGUID(name);
   for(std::vector<std::string>::iterator i = this->Configurations.begin();
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 09b200f..6332d0b 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -250,9 +250,9 @@ void cmGlobalVisualStudio7Generator::WriteTargetConfigurations(
     const char* expath = target->GetProperty("EXTERNAL_MSPROJECT");
     if(expath)
       {
-      this->WriteProjectConfigurations(fout, target->GetName(),
-                                       true,
-                                       target->GetProperty("VS_PLATFORM_MAPPING"));
+      this->WriteProjectConfigurations(
+        fout, target->GetName(),
+        true, target->GetProperty("VS_PLATFORM_MAPPING"));
       }
     else
       {
@@ -585,7 +585,8 @@ cmGlobalVisualStudio7Generator
 // executables to the libraries it uses are also done here
 void cmGlobalVisualStudio7Generator
 ::WriteProjectConfigurations(std::ostream& fout, const char* name,
-                             bool partOfDefaultBuild, const char* platformMapping)
+                             bool partOfDefaultBuild,
+                             const char* platformMapping)
 {
   std::string guid = this->GetGUID(name);
   for(std::vector<std::string>::iterator i = this->Configurations.begin();
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 72eb48d..2a9262a 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -270,7 +270,8 @@ cmGlobalVisualStudio8Generator
 void
 cmGlobalVisualStudio8Generator
 ::WriteProjectConfigurations(std::ostream& fout, const char* name,
-                             bool partOfDefaultBuild, const char* platformMapping)
+                             bool partOfDefaultBuild,
+                             const char* platformMapping)
 {
   std::string guid = this->GetGUID(name);
   for(std::vector<std::string>::iterator i = this->Configurations.begin();
@@ -278,12 +279,14 @@ cmGlobalVisualStudio8Generator
     {
     fout << "\t\t{" << guid << "}." << *i
          << "|" << this->GetPlatformName() << ".ActiveCfg = " << *i << "|"
-         << (platformMapping ? platformMapping : this->GetPlatformName()) << "\n";
+         << (platformMapping ? platformMapping : this->GetPlatformName())
+         << "\n";
     if(partOfDefaultBuild)
       {
       fout << "\t\t{" << guid << "}." << *i
            << "|" << this->GetPlatformName() << ".Build.0 = " << *i << "|"
-           << (platformMapping ? platformMapping : this->GetPlatformName()) << "\n";
+           << (platformMapping ? platformMapping : this->GetPlatformName())
+           << "\n";
       }
     }
 }
diff --git a/Source/cmIncludeExternalMSProjectCommand.cxx b/Source/cmIncludeExternalMSProjectCommand.cxx
index bcec45e..d219c16 100644
--- a/Source/cmIncludeExternalMSProjectCommand.cxx
+++ b/Source/cmIncludeExternalMSProjectCommand.cxx
@@ -71,10 +71,9 @@ bool cmIncludeExternalMSProjectCommand
     if (!customGuid.empty())
       {
       std::string guidVariable = utility_name + "_GUID_CMAKE";
-      this->Makefile->GetCMakeInstance()->AddCacheEntry(guidVariable.c_str(),
-                                                        customGuid.c_str(),
-                                                        "Stored GUID",
-                                                        cmCacheManager::INTERNAL);
+      this->Makefile->GetCMakeInstance()->AddCacheEntry(
+        guidVariable.c_str(), customGuid.c_str(),
+        "Stored GUID", cmCacheManager::INTERNAL);
       }
 
     // Create a target instance for this utility.

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

Summary of changes:
 Source/cmGlobalVisualStudio71Generator.cxx   |    3 ++-
 Source/cmGlobalVisualStudio7Generator.cxx    |    9 +++++----
 Source/cmGlobalVisualStudio8Generator.cxx    |    9 ++++++---
 Source/cmIncludeExternalMSProjectCommand.cxx |    7 +++----
 4 files changed, 16 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake