[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2162-gaf71494

[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  af7149465f004eb048e993f05b38f2e02e0fe399 (commit)
       via  74a21d55e15c011c9ad157eb21be5ef8fcee8545 (commit)
      from  5b02b3329e54f54bc93cb93e4927213a0f933412 (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=af7149465f004eb048e993f05b38f2e02e0fe399
commit af7149465f004eb048e993f05b38f2e02e0fe399
Merge: 5b02b33 74a21d5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 9 04:36:50 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 9 04:36:50 2014 -0400

    Merge topic 'optimize-source-file-processing' into next
    
    74a21d55 Simplify logic.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74a21d55e15c011c9ad157eb21be5ef8fcee8545
commit 74a21d55e15c011c9ad157eb21be5ef8fcee8545
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 9 10:33:53 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Apr 9 10:33:53 2014 +0200

    Simplify logic.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 2ccdc4c..1f8cddb 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -580,17 +580,15 @@ static bool processSources(cmTarget const* tgt,
                                                 tgt,
                                                 dagChecker),
                                       entrySources);
-      if (mf->IsGeneratingBuildSystem())
-        {
-        if (!(*it)->ge->GetHadContextSensitiveCondition())
-          {
-          cacheSources = true;
-          }
-        }
+
       if ((*it)->ge->GetHadContextSensitiveCondition())
         {
         contextDependent = true;
         }
+      else if (mf->IsGeneratingBuildSystem())
+        {
+        cacheSources = true;
+        }
 
       for(std::vector<std::string>::iterator i = entrySources.begin();
           i != entrySources.end(); ++i)

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

Summary of changes:
 Source/cmTarget.cxx |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake