[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-381-g63b7ee1

[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  63b7ee1583b6ae3cdf5566b90d86454730ed61c3 (commit)
       via  5222eb6337fe0f7959887204b261ecb57b357bf1 (commit)
       via  38e773e2c6efb2c318165964bae4aa95a694cea1 (commit)
       via  a2d5323bff7ede7cb62407c7ad69f8431860d06c (commit)
      from  ef02f50e55b46ee9c60b0a3f49065461a722b0ae (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=63b7ee1583b6ae3cdf5566b90d86454730ed61c3
commit 63b7ee1583b6ae3cdf5566b90d86454730ed61c3
Merge: ef02f50 5222eb6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 9 16:30:33 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 9 16:30:33 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    5222eb63 cmLocalGenerator: Remove ConfigureFinalPass.
    38e773e2 project(): Remove unused variable.
    a2d5323b GHS: Remove unused and apparently ineffectual variable.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5222eb6337fe0f7959887204b261ecb57b357bf1
commit 5222eb6337fe0f7959887204b261ecb57b357bf1
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 22:27:35 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=38e773e2c6efb2c318165964bae4aa95a694cea1
commit 38e773e2c6efb2c318165964bae4aa95a694cea1
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 22:23:56 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())

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

    GHS: Remove unused and apparently ineffectual variable.

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 01e2011..4437c05 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -373,7 +373,6 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries()
     cmTarget *tg(GetGlobalGenerator()->FindTarget(libName));
     if (NULL != tg)
       {
-      cmGhsMultiTargetGenerator gmtg(tg);
       libName = tg->GetName() + ".a";
       }
     *this->GetFolderBuildStreams() << "    -l\"" << libName << "\""

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

Summary of changes:
 Source/cmGhsMultiTargetGenerator.cxx |    1 -
 Source/cmGlobalGenerator.cxx         |    2 +-
 Source/cmLocalGenerator.cxx          |    5 -----
 Source/cmLocalGenerator.h            |    5 -----
 Source/cmProjectCommand.cxx          |    1 -
 5 files changed, 1 insertion(+), 13 deletions(-)


hooks/post-receive
-- 
CMake