[Cmake-commits] CMake branch, next, updated. v2.8.3-617-gff3dab4

[Ben Boeckel]

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  ff3dab4cf76f07492e2be677c2847286ac70be2c (commit)
       via  b97ee21fc65487f4b55ac8e5054aeddb33d5127e (commit)
       via  c18c977ce81d730a870958b591f61a65a16c2758 (commit)
      from  a51378af4c9a164d14b33b4ce5656a526fde5c1b (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=ff3dab4cf76f07492e2be677c2847286ac70be2c
commit ff3dab4cf76f07492e2be677c2847286ac70be2c
Merge: a51378a b97ee21
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Nov 15 10:35:07 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 15 10:35:07 2010 -0500

    Merge topic 'dev/strict-mode' into next
    
    b97ee21 Check for unused variables at the end of generate
    c18c977 When checking for variables, specify a reason


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b97ee21fc65487f4b55ac8e5054aeddb33d5127e
commit b97ee21fc65487f4b55ac8e5054aeddb33d5127e
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Nov 15 10:33:14 2010 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Nov 15 10:33:14 2010 -0500

    Check for unused variables at the end of generate

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index bd26b5f..201fceb 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -905,6 +905,8 @@ void cmGlobalGenerator::Generate()
     }
 
   this->CMakeInstance->UpdateProgress("Generating done", -1);
+
+  this->CMakeInstance->RunCheckForUnusedVariables("generation");
 }
 
 //----------------------------------------------------------------------------

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c18c977ce81d730a870958b591f61a65a16c2758
commit c18c977ce81d730a870958b591f61a65a16c2758
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Nov 15 10:32:15 2010 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Nov 15 10:32:15 2010 -0500

    When checking for variables, specify a reason
    
    Allow reasons to begiven for checking for unused variables.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 45599d7..9ecc988 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -832,7 +832,7 @@ void cmMakefile::ConfigureFinalPass()
     l->second.FinishConfigure();
     }
 
-  this->GetCMakeInstance()->RunCheckForUnusedVariables();
+  this->GetCMakeInstance()->RunCheckForUnusedVariables("configure");
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 37373ae..5d910d0 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -4494,7 +4494,7 @@ void cmake::WatchUnusedCli(const char* var)
 #endif
 }
 
-void cmake::RunCheckForUnusedVariables() const
+void cmake::RunCheckForUnusedVariables(const std::string& reason) const
 {
 #ifdef CMAKE_BUILD_WITH_CMAKE
     if(this->WarnUnusedCli)
@@ -4506,7 +4506,8 @@ void cmake::RunCheckForUnusedVariables() const
         if(!it->second)
           {
           std::string message = "warning: The variable, '" + it->first +
-            "', given on the command line, was not used within the build.";
+            "', given on the command line, was not used during the " + reason +
+            ".";
           cmSystemTools::Message(message.c_str());
           }
         }
diff --git a/Source/cmake.h b/Source/cmake.h
index 9001748..b132164 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -365,7 +365,7 @@ class cmake
             bool clean);
 
   void WatchUnusedCli(const char* var);
-  void RunCheckForUnusedVariables() const;
+  void RunCheckForUnusedVariables(const std::string& reason) const;
 protected:
   void InitializeProperties();
   int HandleDeleteCacheVariables(const char* var);

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

Summary of changes:
 Source/cmGlobalGenerator.cxx |    2 ++
 Source/cmMakefile.cxx        |    2 +-
 Source/cmake.cxx             |    5 +++--
 Source/cmake.h               |    2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake