[Cmake-commits] CMake branch, master, updated. v3.3.0-712-g73e3de3

[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  73e3de381d87a635e303e2076a46cb739466c1a4 (commit)
       via  757a1f54085af4645ee1946329e24538162ac054 (commit)
       via  52dbe654dea7562564be9d880540e6bc706998ba (commit)
       via  65a5e0c671fc7d42525a6279aebf9a74de2c97a7 (commit)
       via  348354333a82ce98d733dc2ee939186c53c506f9 (commit)
       via  af0de01c6b3395fb1dba5d2ee0a94c19a9b464e9 (commit)
       via  6ae8b30bf4127011284a66541ed2116fcb45f007 (commit)
       via  a5fc17b5098ee27fd7ae457ca6c5743bacc384a7 (commit)
       via  0a01e6c6e7bd428ca0ec99a00924b5b498c6e637 (commit)
       via  f0005bb484bc2b85a169ef7816e33d8e2f16e109 (commit)
      from  370e2c6785ce9167c9945763505353816780326c (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=73e3de381d87a635e303e2076a46cb739466c1a4
commit 73e3de381d87a635e303e2076a46cb739466c1a4
Merge: 370e2c6 757a1f5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 6 09:38:24 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 6 09:38:24 2015 -0400

    Merge topic 'cmState-policies'
    
    757a1f54 cmState: Move PolicyState from cmMakefile.
    52dbe654 cmState: Record the end position of each directory.
    65a5e0c6 cmLinkedTree: Add Clear API.
    34835433 cmState: Add Type for policy scope.
    af0de01c cmState: Remove call stack parent tracking.
    6ae8b30b cmMakefile: Move policy barriers inside cmState scopes.
    a5fc17b5 cmMakefile: Re-order policy entries and barriers.
    0a01e6c6 cmState: Add Snapshot Type accessor.
    f0005bb4 Tests: Verify generate-time policy scope behavior.

diff --cc Source/cmMakefile.cxx
index 165e271,a0a36ec..60a11e1
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@@ -236,15 -235,7 +236,10 @@@ cmMakefile::~cmMakefile(
    cmDeleteAll(this->ImportedTargetsOwned);
    cmDeleteAll(this->FinalPassCommands);
    cmDeleteAll(this->FunctionBlockers);
 +  cmDeleteAll(this->EvaluationFiles);
 +  this->EvaluationFiles.clear();
 +
    this->FunctionBlockers.clear();
-   if (this->PolicyStack.size() != 1)
-   {
-     cmSystemTools::Error("Internal CMake Error, Policy Stack has not been"
-       " popped properly");
-   }
  }
  
  //----------------------------------------------------------------------------

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

Summary of changes:
 Source/cmLinkedTree.h                              |    6 +
 Source/cmMakefile.cxx                              |  130 ++++-----------
 Source/cmMakefile.h                                |   13 --
 Source/cmState.cxx                                 |  171 ++++++++++++++++++--
 Source/cmState.h                                   |   15 +-
 Tests/RunCMake/CMakeLists.txt                      |    1 +
 .../RunCMake/{Ninja => PolicyScope}/CMakeLists.txt |    2 +-
 Tests/RunCMake/PolicyScope/RunCMakeTest.cmake      |    4 +
 .../dir-in-macro-generate-time-result.txt}         |    0
 .../dir-in-macro-generate-time-stderr.txt}         |    4 +-
 .../PolicyScope/dir-in-macro-generate-time.cmake   |    2 +
 .../PolicyScope/dir-in-macro-include.cmake         |    6 +
 Tests/RunCMake/PolicyScope/dir1/CMakeLists.txt     |    5 +
 .../PolicyScope/dir1/foo.cpp}                      |    0
 .../parent-dir-generate-time-result.txt}           |    0
 .../PolicyScope/parent-dir-generate-time.cmake     |    7 +
 16 files changed, 235 insertions(+), 131 deletions(-)
 copy Tests/RunCMake/{Ninja => PolicyScope}/CMakeLists.txt (66%)
 create mode 100644 Tests/RunCMake/PolicyScope/RunCMakeTest.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => PolicyScope/dir-in-macro-generate-time-result.txt} (100%)
 copy Tests/RunCMake/{GeneratorExpression/CMP0044-WARN-stderr.txt => PolicyScope/dir-in-macro-generate-time-stderr.txt} (69%)
 create mode 100644 Tests/RunCMake/PolicyScope/dir-in-macro-generate-time.cmake
 create mode 100644 Tests/RunCMake/PolicyScope/dir-in-macro-include.cmake
 create mode 100644 Tests/RunCMake/PolicyScope/dir1/CMakeLists.txt
 copy Tests/{CTestTestCycle/simple.cxx => RunCMake/PolicyScope/dir1/foo.cpp} (100%)
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => PolicyScope/parent-dir-generate-time-result.txt} (100%)
 create mode 100644 Tests/RunCMake/PolicyScope/parent-dir-generate-time.cmake


hooks/post-receive
-- 
CMake