[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2021-g5948a98

[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  5948a987e8633f6be2aa140051a3d8e8954e3bb0 (commit)
       via  c85052786e88b0b82e4c57dff47c5a17bc841dde (commit)
      from  37bdf11cce238f61210da0cf9e1ccd57a17bef3a (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=5948a987e8633f6be2aa140051a3d8e8954e3bb0
commit 5948a987e8633f6be2aa140051a3d8e8954e3bb0
Merge: 37bdf11 c850527
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 7 18:07:43 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 7 18:07:43 2013 -0500

    Merge topic 'minor-fixes' into next
    
    c850527 There are 10 difficult problems in computer science:


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c85052786e88b0b82e4c57dff47c5a17bc841dde
commit c85052786e88b0b82e4c57dff47c5a17bc841dde
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 7 23:55:02 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 7 23:55:02 2013 +0100

    There are 10 difficult problems in computer science:
    
     * Naming things
     * Cache invalidation
     * Off-by-one errors
    
    And this feature has them all.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 52f6e03..59afcb6 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2809,7 +2809,8 @@ std::vector<std::string> cmTarget::GetIncludeDirectories(const char *config)
                                                 this,
                                                 &dagChecker),
                                       entryIncludes);
-      if (!(*it)->ge->GetHadContextSensitiveCondition())
+      if (this->Makefile->IsGeneratingBuildSystem()
+          && !(*it)->ge->GetHadContextSensitiveCondition())
         {
         cacheIncludes = true;
         }

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

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


hooks/post-receive
-- 
CMake