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 623f04a71ceb2687b2b2b7cb961f45a848902a3e (commit)
via 1f17a9f39f579459c2c0a68001aaa828fdbc0dc0 (commit)
from 5948a987e8633f6be2aa140051a3d8e8954e3bb0 (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=623f04a71ceb2687b2b2b7cb961f45a848902a3e
commit 623f04a71ceb2687b2b2b7cb961f45a848902a3e
Merge: 5948a98 1f17a9f
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Feb 7 18:10:56 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Feb 7 18:10:56 2013 -0500
Merge topic 'minor-fixes' into next
1f17a9f Ensure that the build interface includes have been added.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f17a9f39f579459c2c0a68001aaa828fdbc0dc0
commit 1f17a9f39f579459c2c0a68001aaa828fdbc0dc0
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Feb 7 19:35:00 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Fri Feb 8 00:08:06 2013 +0100
Ensure that the build interface includes have been added.
This is needed in the case that Automoc is used, as that calls
GetIncludeDirectories, which may cache the resulting include dirs
too early in the generate step.
Also, because the automoc step is so early, we can't cache the
include directories at that point. At that point the build interface
of all dependencies are not populated yet, so we'd be caching the
includes before appending the build interface. Only start caching
when we're definitely generating the buildsystem. At that point, the
includes should be stable.
We still need to invoke AppendBuildInterfaceIncludes
in the GlobalGenerator because the build interface includes affect
mostly the dependencies of targets (such as the automoc targets),
rather than the targets themselves, so the build interface needs
to be appended for all targets before generation is done.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 2945173..59afcb6 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2767,6 +2767,7 @@ std::vector<std::string>
cmTarget::GetIncludeDirectories(const char *config)
this->GetName(),
"INCLUDE_DIRECTORIES", 0, 0);
+ this->AppendBuildInterfaceIncludes();
std::vector<std::string> debugProperties;
const char *debugProp =
@@ -2808,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:
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
