[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2160-g5b02b33

[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  5b02b3329e54f54bc93cb93e4927213a0f933412 (commit)
       via  dec486cd083783fe89bd9618da134262c6b4d9b0 (commit)
      from  f8387d7d581702f35823c5ede1ce7d3f3002217c (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=5b02b3329e54f54bc93cb93e4927213a0f933412
commit 5b02b3329e54f54bc93cb93e4927213a0f933412
Merge: f8387d7 dec486c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 9 04:29:08 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 9 04:29:08 2014 -0400

    Merge topic 'optimize-source-file-processing' into next
    
    dec486cd Fix contextDependent computation logic.


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

    Fix contextDependent computation logic.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 9c0697d..2ccdc4c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -586,10 +586,10 @@ static bool processSources(cmTarget const* tgt,
           {
           cacheSources = true;
           }
-        else
-          {
-          contextDependent = true;
-          }
+        }
+      if ((*it)->ge->GetHadContextSensitiveCondition())
+        {
+        contextDependent = true;
         }
 
       for(std::vector<std::string>::iterator i = entrySources.begin();

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

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


hooks/post-receive
-- 
CMake