[Cmake-commits] CMake branch, next, updated. v3.0.0-3717-g99d501f

[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  99d501f00732610fa6187463613abb6835bfe3e7 (commit)
       via  cb67509b06b9acdc3e23ea7dfc13257e9e8d1b20 (commit)
      from  866ac68f6f540fbfa1d626dcf516cfee3ff85599 (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=99d501f00732610fa6187463613abb6835bfe3e7
commit 99d501f00732610fa6187463613abb6835bfe3e7
Merge: 866ac68 cb67509
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 13 10:27:42 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 13 10:27:42 2014 -0400

    Merge topic 'vs-subdir-sln-depends' into next
    
    cb67509b VS: Remove unused parameter of WriteTargetConfigurations


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb67509b06b9acdc3e23ea7dfc13257e9e8d1b20
commit cb67509b06b9acdc3e23ea7dfc13257e9e8d1b20
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 13 08:57:34 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 13 08:57:34 2014 -0400

    VS: Remove unused parameter of WriteTargetConfigurations
    
    The cmGlobalVisualStudio7Generator::WriteTargetConfigurations
    'root' parameter is no longer used, so remove it.

diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 4bea5ac..a67a649 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -118,7 +118,7 @@ void cmGlobalVisualStudio71Generator
   fout << "\tGlobalSection(" << this->ProjectConfigurationSectionName
        << ") = postSolution\n";
   // Write out the configurations for all the targets in the project
-  this->WriteTargetConfigurations(fout, root, orderedProjectTargets);
+  this->WriteTargetConfigurations(fout, orderedProjectTargets);
   fout << "\tEndGlobalSection\n";
 
   if (useFolderProperty)
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 08f685e..a918d1d 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -366,7 +366,6 @@ void cmGlobalVisualStudio7Generator::OutputSLNFile()
 
 void cmGlobalVisualStudio7Generator::WriteTargetConfigurations(
   std::ostream& fout,
-  cmLocalGenerator* root,
   OrderedTargetDependSet const& projectTargets)
 {
   // loop over again and write out configurations for each target
@@ -578,7 +577,7 @@ void cmGlobalVisualStudio7Generator
 
   // Write out the configurations for all the targets in the project
   fout << "\tGlobalSection(ProjectConfiguration) = postSolution\n";
-  this->WriteTargetConfigurations(fout, root, orderedProjectTargets);
+  this->WriteTargetConfigurations(fout, orderedProjectTargets);
   fout << "\tEndGlobalSection\n";
 
   // Write out global sections
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 7f55381..291d297 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -150,7 +150,6 @@ protected:
     OrderedTargetDependSet const& projectTargets);
   virtual void WriteTargetConfigurations(
     std::ostream& fout,
-    cmLocalGenerator* root,
     OrderedTargetDependSet const& projectTargets);
 
   void GenerateConfigurations(cmMakefile* mf);

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

Summary of changes:
 Source/cmGlobalVisualStudio71Generator.cxx |    2 +-
 Source/cmGlobalVisualStudio7Generator.cxx  |    3 +--
 Source/cmGlobalVisualStudio7Generator.h    |    1 -
 3 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake