[Cmake-commits] CMake branch, next, updated. v3.3.0-1797-g8b0fd7f

[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  8b0fd7f79a86971233d8561ed9fc8cc2d6df9372 (commit)
       via  975426ceb339cf7a17f57ffba2757bb368669f93 (commit)
      from  1e7713c82c352d6f69a4add9614611d4e3b6f0de (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=8b0fd7f79a86971233d8561ed9fc8cc2d6df9372
commit 8b0fd7f79a86971233d8561ed9fc8cc2d6df9372
Merge: 1e7713c 975426c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 3 10:21:06 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 3 10:21:06 2015 -0400

    Merge topic 'cmake-W-options' into next
    
    975426ce cmake: Do not treat developer warnings as errors by default in scripts


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=975426ceb339cf7a17f57ffba2757bb368669f93
commit 975426ceb339cf7a17f57ffba2757bb368669f93
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 3 10:00:42 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 3 10:03:27 2015 -0400

    cmake: Do not treat developer warnings as errors by default in scripts
    
    The logic in commit c96fe0b4 (cmake: Add -W options to control
    deprecation warnings and errors, 2015-07-28) accidentally enables
    errors on warnings by default in scripts because there is no
    initialization of CMAKE_SUPPRESS_DEVELOPER_ERRORS to TRUE.
    
    Rename internal CMAKE_SUPPRESS_DEVELOPER_ERRORS cache entry to
    CMAKE_ERROR_DEVELOPER_WARNINGS.  Fix the logic in the message() command
    to treat AUTHOR_WARNING as an error only if the option is explicitly
    enabled.

diff --git a/Source/cmMessageCommand.cxx b/Source/cmMessageCommand.cxx
index e09ba75..467555f 100644
--- a/Source/cmMessageCommand.cxx
+++ b/Source/cmMessageCommand.cxx
@@ -43,7 +43,7 @@ bool cmMessageCommand
     }
   else if (*i == "AUTHOR_WARNING")
     {
-    if (!this->Makefile->IsOn("CMAKE_SUPPRESS_DEVELOPER_ERRORS"))
+    if (this->Makefile->IsOn("CMAKE_ERROR_DEVELOPER_WARNINGS"))
       {
       fatal = true;
       type = cmake::AUTHOR_ERROR;
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 6832141..e28f385 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1289,7 +1289,7 @@ int cmake::Configure()
                       " the author of the CMakeLists.txt files.",
                       cmState::INTERNAL);
       this->CacheManager->
-        AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_ERRORS", "TRUE",
+        AddCacheEntry("CMAKE_ERROR_DEVELOPER_WARNINGS", "FALSE",
                       "Suppress errors that are meant for"
                       " the author of the CMakeLists.txt files.",
                       cmState::INTERNAL);
@@ -1328,7 +1328,7 @@ int cmake::Configure()
     else if (warningLevel == ERROR_LEVEL)
       {
       this->CacheManager->
-        AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_ERRORS", "FALSE",
+        AddCacheEntry("CMAKE_ERROR_DEVELOPER_WARNINGS", "TRUE",
                       "Suppress errors that are meant for"
                       " the author of the CMakeLists.txt files.",
                       cmState::INTERNAL);
@@ -1676,11 +1676,11 @@ int cmake::Run(const std::vector<std::string>& args, bool noconfigure)
     }
 
   // don't turn dev warnings into errors by default, if no value has been
-  // specified for the flag, enable it
-  if (!this->State->GetCacheEntryValue("CMAKE_SUPPRESS_DEVELOPER_ERRORS"))
+  // specified for the flag, disable it
+  if (!this->State->GetCacheEntryValue("CMAKE_ERROR_DEVELOPER_WARNINGS"))
     {
     this->CacheManager->
-            AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_ERRORS", "TRUE",
+            AddCacheEntry("CMAKE_ERROR_DEVELOPER_WARNINGS", "FALSE",
                           "Suppress errors that are meant for"
                           " the author of the CMakeLists.txt files.",
                           cmState::INTERNAL);

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

Summary of changes:
 Source/cmMessageCommand.cxx |    2 +-
 Source/cmake.cxx            |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake