[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2570-ga97ddb4

[Stephen Kelly]

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  a97ddb475bf71f8a69ed73637c830f49e9f55303 (commit)
       via  477e4136ef525e16e9d91174bf3bfebf8b0d2650 (commit)
       via  9ac601618ef93ac4c5c6805fe3bb7d19a56bf5a6 (commit)
       via  adfe9b3805e1b728d6392eb6ad731c6ebe644b02 (commit)
       via  63e7137af5307391595fb161ea48b34a05fe0800 (commit)
      from  fe5cfab71be0cd47abbe21282bed0361bfe61f12 (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=a97ddb475bf71f8a69ed73637c830f49e9f55303
commit a97ddb475bf71f8a69ed73637c830f49e9f55303
Merge: fe5cfab 477e413
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jun 10 09:55:03 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 10 09:55:03 2013 -0400

    Merge topic 'fix-COMPILE_OPTIONS-transitive-performance-regression' into next
    
    477e413 Add missing 'seen' check for evaluating COMPILE_OPTIONS.
    9ac6016 CMake Nightly Date Stamp
    adfe9b3 CMake Nightly Date Stamp
    63e7137 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=477e4136ef525e16e9d91174bf3bfebf8b0d2650
commit 477e4136ef525e16e9d91174bf3bfebf8b0d2650
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jun 10 15:46:51 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jun 10 15:46:51 2013 +0200

    Add missing 'seen' check for evaluating COMPILE_OPTIONS.
    
    Commit 089fe1c1 (Optimize genex evaluation for includes and
    defines., 2013-02-01) introduced an optimization on DAG processing
    to not reprocess properties on targets which have already been seen.
    
    This was refactored slightly in commit 8dfdf1c7 (Fix the tests for
    evaluating includes and defines., 2013-02-18), but was not extended
    to cover COMPILE_OPTIONS in commit 80ca9c4b (Add COMPILE_OPTIONS target
    property., 2013-05-16).
    
    This omission causes the same performance regression in running
    cmake on LLVM which 089fe1c1 fixed before, but this time for the
    transitive evaluation of the COMPILE_OPTIONS property.

diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx
index e5ffb0c..6c6a7d4 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -34,7 +34,8 @@ cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker(
   this->CheckResult = this->checkGraph();
 
   if (CheckResult == DAG && (top->EvaluatingIncludeDirectories()
-      || top->EvaluatingCompileDefinitions()))
+      || top->EvaluatingCompileDefinitions()
+      || top->EvaluatingCompileOptions()))
     {
     std::map<cmStdString, std::set<cmStdString> >::const_iterator it
                                                     = top->Seen.find(target);

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

Summary of changes:
 Source/CMakeVersion.cmake                  |    2 +-
 Source/cmGeneratorExpressionDAGChecker.cxx |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake