[Cmake-commits] CMake branch, master, updated. v3.3.2-1296-g414cc18

[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, master has been updated
       via  414cc18a9a76e78b586edbd6eb34cc0060cae796 (commit)
       via  2e6063068c94d4045e699fed51e6d1e9af344bbf (commit)
       via  81739e9215ef10d870f14404b0ec5eb4bee16ce4 (commit)
      from  02f95f9b7cc56aee8e4d73ea951bad34b622ec9b (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=414cc18a9a76e78b586edbd6eb34cc0060cae796
commit 414cc18a9a76e78b586edbd6eb34cc0060cae796
Merge: 02f95f9 2e60630
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 25 16:16:17 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 25 16:16:17 2015 -0400

    Merge topic 'revert-cmake-W-options'
    
    2e606306 Merge branch 'improve-variable-help-formatting' into revert-cmake-W-options
    81739e92 Revert topic 'cmake-W-options' (#15747)

diff --cc Source/cmake.h
index 8ac8897,20e49e3..9d28cba
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@@ -339,9 -338,11 +337,10 @@@ protected
    void AddExtraGenerator(const std::string& name,
                           CreateExtraGeneratorFunctionType newFunction);
  
 -  cmPolicies *Policies;
    cmGlobalGenerator *GlobalGenerator;
    cmCacheManager *CacheManager;
-   std::map<std::string, WarningLevel> WarningLevels;
+   bool SuppressDevWarnings;
+   bool DoSuppressDevWarnings;
    std::string GeneratorPlatform;
    std::string GeneratorToolset;
  

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

Summary of changes:
 Help/manual/OPTIONS_BUILD.txt                      |   43 +---
 Help/release/dev/cmake-W-options.rst               |   13 --
 Help/variable/CMAKE_ERROR_DEPRECATED.rst           |    4 -
 Help/variable/CMAKE_WARN_DEPRECATED.rst            |    4 -
 Source/cmMessageCommand.cxx                        |   14 +-
 Source/cmake.cxx                                   |  234 +++-----------------
 Source/cmake.h                                     |   27 +--
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake      |   46 ----
 Tests/RunCMake/CommandLine/W_bad-arg1-result.txt   |    1 -
 Tests/RunCMake/CommandLine/W_bad-arg1-stderr.txt   |    2 -
 Tests/RunCMake/CommandLine/W_bad-arg2-result.txt   |    1 -
 Tests/RunCMake/CommandLine/W_bad-arg2-stderr.txt   |    2 -
 Tests/RunCMake/CommandLine/W_bad-arg3-result.txt   |    1 -
 Tests/RunCMake/CommandLine/W_bad-arg3-stderr.txt   |    2 -
 Tests/RunCMake/CommandLine/Wdeprecated-stderr.txt  |    4 -
 Tests/RunCMake/CommandLine/Wdeprecated.cmake       |    1 -
 .../CommandLine/Werror_deprecated-result.txt       |    1 -
 .../CommandLine/Werror_deprecated-stderr.txt       |    4 -
 Tests/RunCMake/CommandLine/Werror_deprecated.cmake |    1 -
 Tests/RunCMake/CommandLine/Werror_dev-result.txt   |    1 -
 Tests/RunCMake/CommandLine/Werror_dev-stderr.txt   |    5 -
 Tests/RunCMake/CommandLine/Werror_dev.cmake        |    1 -
 Tests/RunCMake/CommandLine/Wno-deprecated.cmake    |    1 -
 .../CommandLine/Wno-error_deprecated.cmake         |    1 -
 Tests/RunCMake/CommandLine/Wno-error_dev.cmake     |    1 -
 25 files changed, 41 insertions(+), 374 deletions(-)
 delete mode 100644 Help/release/dev/cmake-W-options.rst
 delete mode 100644 Tests/RunCMake/CommandLine/W_bad-arg1-result.txt
 delete mode 100644 Tests/RunCMake/CommandLine/W_bad-arg1-stderr.txt
 delete mode 100644 Tests/RunCMake/CommandLine/W_bad-arg2-result.txt
 delete mode 100644 Tests/RunCMake/CommandLine/W_bad-arg2-stderr.txt
 delete mode 100644 Tests/RunCMake/CommandLine/W_bad-arg3-result.txt
 delete mode 100644 Tests/RunCMake/CommandLine/W_bad-arg3-stderr.txt
 delete mode 100644 Tests/RunCMake/CommandLine/Wdeprecated-stderr.txt
 delete mode 100644 Tests/RunCMake/CommandLine/Wdeprecated.cmake
 delete mode 100644 Tests/RunCMake/CommandLine/Werror_deprecated-result.txt
 delete mode 100644 Tests/RunCMake/CommandLine/Werror_deprecated-stderr.txt
 delete mode 100644 Tests/RunCMake/CommandLine/Werror_deprecated.cmake
 delete mode 100644 Tests/RunCMake/CommandLine/Werror_dev-result.txt
 delete mode 100644 Tests/RunCMake/CommandLine/Werror_dev-stderr.txt
 delete mode 100644 Tests/RunCMake/CommandLine/Werror_dev.cmake
 delete mode 100644 Tests/RunCMake/CommandLine/Wno-deprecated.cmake
 delete mode 100644 Tests/RunCMake/CommandLine/Wno-error_deprecated.cmake
 delete mode 100644 Tests/RunCMake/CommandLine/Wno-error_dev.cmake


hooks/post-receive
-- 
CMake