[Cmake-commits] CMake branch, master, updated. v3.2.1-772-g62c5e6f

[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  62c5e6f1a19df0043a0e9aaba6cf7247f76a5cc3 (commit)
       via  f081c5bdddcfcaaf5bee7b918fe5c7ff01faae35 (commit)
       via  f71fdf0ec8289ada5b32b784bc2f6f617538ce0b (commit)
       via  ff7169a03c2ae2e7a0440c1f2921b7ce6b2e486c (commit)
       via  a6b1ad1309d14668e572da7937a2a8dda9e1f669 (commit)
      from  92d61798937e42ecb7ae3d1be8b2b4ab7ce15fcb (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=62c5e6f1a19df0043a0e9aaba6cf7247f76a5cc3
commit 62c5e6f1a19df0043a0e9aaba6cf7247f76a5cc3
Merge: 92d6179 f081c5b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 13 11:45:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 13 11:45:02 2015 -0400

    Merge topic 'introduce-cmState'
    
    f081c5bd cmState: Move CacheEntryType enum from cmCacheManager.
    f71fdf0e cmMakefile: Remove unused CacheManager accessor.
    ff7169a0 Port to cmState.
    a6b1ad13 Introduce cmState class.

diff --cc Source/cmake.h
index 4c2ad29,bbeb95d..e80cc1c
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@@ -447,12 -477,12 +452,14 @@@ private
    bool DebugTryCompile;
    cmFileTimeComparison* FileComparison;
    std::string GraphVizFile;
 -  std::vector<std::string> DebugConfigs;
    InstalledFilesMap InstalledFiles;
  
+   cmState* State;
+ 
    void UpdateConversionPathTable();
 +
 +  // Print a list of valid generators to stderr.
 +  void PrintGeneratorList();
  };
  
  #define CMAKE_STANDARD_OPTIONS_TABLE \

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

Summary of changes:
 Source/CMakeLists.txt                              |    2 +
 Source/CursesDialog/ccmake.cxx                     |    1 -
 Source/CursesDialog/cmCursesBoolWidget.cxx         |    2 +-
 .../CursesDialog/cmCursesCacheEntryComposite.cxx   |   17 +-
 Source/CursesDialog/cmCursesCacheEntryComposite.h  |    1 -
 Source/CursesDialog/cmCursesDummyWidget.cxx        |    2 +-
 Source/CursesDialog/cmCursesFilePathWidget.cxx     |    2 +-
 Source/CursesDialog/cmCursesLongMessageForm.cxx    |    1 -
 Source/CursesDialog/cmCursesMainForm.cxx           |   80 ++++-----
 Source/CursesDialog/cmCursesMainForm.h             |    2 +-
 Source/CursesDialog/cmCursesOptionsWidget.cxx      |    2 +-
 Source/CursesDialog/cmCursesPathWidget.cxx         |    4 +-
 Source/CursesDialog/cmCursesStringWidget.cxx       |    2 +-
 Source/CursesDialog/cmCursesWidget.h               |    6 +-
 Source/QtDialog/QCMake.cxx                         |   62 +++----
 Source/cmBuildCommand.cxx                          |    2 +-
 Source/cmBuildNameCommand.cxx                      |    4 +-
 Source/cmCPluginAPI.cxx                            |   12 +-
 Source/cmCTest.cxx                                 |    2 +-
 Source/cmCacheManager.cxx                          |   96 +++--------
 Source/cmCacheManager.h                            |   38 ++---
 Source/cmCommandArgumentParserHelper.cxx           |    3 +-
 Source/cmCoreTryCompile.cxx                        |    3 +-
 Source/cmExtraEclipseCDT4Generator.cxx             |    7 +-
 Source/cmFindBase.cxx                              |   11 +-
 Source/cmFindLibraryCommand.cxx                    |    7 +-
 Source/cmFindPackageCommand.cxx                    |    2 +-
 Source/cmFindPathCommand.cxx                       |    7 +-
 Source/cmFindProgramCommand.cxx                    |    7 +-
 Source/cmGetFilenameComponentCommand.cxx           |    8 +-
 Source/cmGetPropertyCommand.cxx                    |    5 +-
 Source/cmGlobalGenerator.cxx                       |   19 ++-
 Source/cmGlobalUnixMakefileGenerator3.cxx          |    2 +-
 Source/cmGlobalVisualStudio7Generator.cxx          |    8 +-
 Source/cmGlobalXCodeGenerator.cxx                  |    4 +-
 Source/cmIncludeExternalMSProjectCommand.cxx       |    2 +-
 Source/cmLoadCacheCommand.cxx                      |    2 +-
 Source/cmLocalVisualStudio10Generator.cxx          |    2 +-
 Source/cmLocalVisualStudio7Generator.cxx           |    3 +-
 Source/cmMakefile.cxx                              |   47 ++---
 Source/cmMakefile.h                                |    6 +-
 Source/cmMarkAsAdvancedCommand.cxx                 |   12 +-
 Source/cmOptionCommand.cxx                         |   10 +-
 Source/cmProjectCommand.cxx                        |    6 +-
 Source/cmSetCommand.cxx                            |   14 +-
 Source/cmSetPropertyCommand.cxx                    |   16 +-
 Source/cmSiteNameCommand.cxx                       |    2 +-
 Source/cmState.cxx                                 |  180 ++++++++++++++++++++
 Source/cmState.h                                   |   62 +++++++
 Source/cmTarget.cxx                                |    4 +-
 Source/cmTryRunCommand.cxx                         |   21 ++-
 Source/cmUtilitySourceCommand.cxx                  |    6 +-
 Source/cmVariableRequiresCommand.cxx               |    8 +-
 Source/cmake.cxx                                   |  125 +++++++-------
 Source/cmake.h                                     |    9 +-
 Source/cmakemain.cxx                               |   20 +--
 bootstrap                                          |    1 +
 57 files changed, 595 insertions(+), 396 deletions(-)
 create mode 100644 Source/cmState.cxx
 create mode 100644 Source/cmState.h


hooks/post-receive
-- 
CMake