[Cmake-commits] CMake branch, next, updated. v2.8.2-691-g5c85df3

[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  5c85df3208a91ad54e21240e6915f00984be2274 (commit)
       via  8b520158c3c378acde541d2e99103dc9ab834595 (commit)
       via  439877f6208e25790ab14ae0e66efc392949e9e2 (commit)
      from  2966fcb5515bb7e4f46d5544c335f4364a78875f (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=5c85df3208a91ad54e21240e6915f00984be2274
commit 5c85df3208a91ad54e21240e6915f00984be2274
Merge: 2966fcb 8b52015
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Sep 7 15:13:31 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 7 15:13:31 2010 -0400

    Merge topic 'dev/strict-mode' into next
    
    8b52015 Push the initialize and unused states when copying
    439877f Be consistent with single and double quotes


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b520158c3c378acde541d2e99103dc9ab834595
commit 8b520158c3c378acde541d2e99103dc9ab834595
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Sep 7 15:09:33 2010 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Sep 7 15:12:15 2010 -0400

    Push the initialize and unused states when copying

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 26b9a58..33c61a7 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -99,6 +99,8 @@ cmMakefile::cmMakefile(): Internal(new Internals)
 cmMakefile::cmMakefile(const cmMakefile& mf): Internal(new Internals)
 {
   this->Internal->VarStack.push(mf.Internal->VarStack.top().Closure());
+  this->Internal->VarInitStack.push(mf.Internal->VarInitStack.top());
+  this->Internal->VarUsageStack.push(mf.Internal->VarUsageStack.top());
 
   this->Prefix = mf.Prefix;
   this->AuxSourceDirectories = mf.AuxSourceDirectories;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=439877f6208e25790ab14ae0e66efc392949e9e2
commit 439877f6208e25790ab14ae0e66efc392949e9e2
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Sep 2 12:14:06 2010 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Sep 2 12:14:06 2010 -0400

    Be consistent with single and double quotes

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index f4680ca..757ad6f 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -4496,7 +4496,7 @@ void cmake::RunCheckForUnusedVariables() const
         {
         if(!it->second)
           {
-          std::string message = "warning: The variable, \"" + it->first + "\", given "
+          std::string message = "warning: The variable, '" + it->first + "', given "
             "on the command line, was not used within the build.";
           cmSystemTools::Message(message.c_str());
           }
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 481be09..995a749 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1082,9 +1082,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
     --build-noclean
     --build-project WarnUnusedCliUnused
-    --build-options "-DUNUSED_VARIABLE=Unused")
+    --build-options "-DUNUSED_CLI_VARIABLE=Unused")
   SET_TESTS_PROPERTIES(WarnUnusedCliUnused PROPERTIES
-    PASS_REGULAR_EXPRESSION "warning: The variable, \"UNUSED_VARIABLE\"")
+    PASS_REGULAR_EXPRESSION "warning: The variable, 'UNUSED_CLI_VARIABLE'")
   LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/WarnUnusedCliUnused")
 
   ADD_TEST(WarnUnusedCliUsed ${CMAKE_CTEST_COMMAND}
@@ -1099,7 +1099,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
   SET_TESTS_PROPERTIES(WarnUnusedCliUsed PROPERTIES
     PASS_REGULAR_EXPRESSION "Usage proven")
   SET_TESTS_PROPERTIES(WarnUnusedCliUsed PROPERTIES
-    FAIL_REGULAR_EXPRESSION "warning: The variable, \"USED_VARIABLE\"")
+    FAIL_REGULAR_EXPRESSION "warning: The variable, 'USED_VARIABLE'")
   LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/WarnUnusedCliUsed")
 
   ADD_TEST(WarnUninitialized ${CMAKE_CTEST_COMMAND}

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

Summary of changes:
 Source/cmMakefile.cxx |    2 ++
 Source/cmake.cxx      |    2 +-
 Tests/CMakeLists.txt  |    6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake