[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-395-gce04885

[Stephen Kelly]

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  ce04885e702fc43249723e4ddccf7754309b1308 (commit)
       via  22d09ecf33f3d07925003995b76b7e8aa788c04f (commit)
       via  821a711b6ff59fd1fa0c0cbaa43178cee1718078 (commit)
      from  b3b7311cb83d335afcff7091f9f2e96d3d363ea8 (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=ce04885e702fc43249723e4ddccf7754309b1308
commit ce04885e702fc43249723e4ddccf7754309b1308
Merge: b3b7311 22d09ec
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 9 17:42:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 9 17:42:50 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    22d09ecf cmLocalGenerator: Remove ConfigureFinalPass.
    821a711b project(): Remove unused variable.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22d09ecf33f3d07925003995b76b7e8aa788c04f
commit 22d09ecf33f3d07925003995b76b7e8aa788c04f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 9 22:27:35 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 9 23:42:13 2015 +0200

    cmLocalGenerator: Remove ConfigureFinalPass.
    
    Call the cmMakefile implementation directly.  This is a configure-time
    construct.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index bd949bb..9b02cbb 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1540,7 +1540,7 @@ void cmGlobalGenerator::CheckLocalGenerators()
   cmState* state = this->GetCMakeInstance()->GetState();
   for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
     {
-    this->LocalGenerators[i]->ConfigureFinalPass();
+    this->LocalGenerators[i]->GetMakefile()->ConfigureFinalPass();
     cmTargets &targets =
       this->LocalGenerators[i]->GetMakefile()->GetTargets();
     for (cmTargets::iterator l = targets.begin();
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 5ed53d0..98accf9 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -113,11 +113,6 @@ void cmLocalGenerator::ComputeObjectMaxPath()
   this->ObjectMaxPathViolations.clear();
 }
 
-void cmLocalGenerator::ConfigureFinalPass()
-{
-  this->Makefile->ConfigureFinalPass();
-}
-
 void cmLocalGenerator::TraceDependencies()
 {
   std::vector<std::string> configs;
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index efdd487..42df2b8 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -55,11 +55,6 @@ public:
   virtual void AddHelperCommands() {}
 
   /**
-   * Perform any final calculations prior to generation
-   */
-  void ConfigureFinalPass();
-
-  /**
    * Generate the install rules files in this directory.
    */
   void GenerateInstallRules();

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=821a711b6ff59fd1fa0c0cbaa43178cee1718078
commit 821a711b6ff59fd1fa0c0cbaa43178cee1718078
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 9 22:23:56 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 9 23:42:13 2015 +0200

    project(): Remove unused variable.

diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx
index 176cb0d..90bc111 100644
--- a/Source/cmProjectCommand.cxx
+++ b/Source/cmProjectCommand.cxx
@@ -233,7 +233,6 @@ bool cmProjectCommand
   const char* include = this->Makefile->GetDefinition(extraInclude);
   if(include)
     {
-    std::string fullFilePath;
     bool readit =
       this->Makefile->ReadDependentFile(include);
     if(!readit && !cmSystemTools::GetFatalErrorOccured())

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

Summary of changes:


hooks/post-receive
-- 
CMake