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 37bdf11cce238f61210da0cf9e1ccd57a17bef3a (commit)
via 3c4b16bec19dbacf1cb4d413771901da17eab2e1 (commit)
via df74bc34d4219a8d6e63ec7e41a9ca4fbe355581 (commit)
from 5f456ded1e6426c57f82306f36a517875898a68a (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=37bdf11cce238f61210da0cf9e1ccd57a17bef3a
commit 37bdf11cce238f61210da0cf9e1ccd57a17bef3a
Merge: 5f456de 3c4b16b
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Feb 7 16:10:28 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Feb 7 16:10:28 2013 -0500
Merge topic 'minor-fixes' into next
3c4b16b Ensure that the build interface includes have been added.
df74bc3 Only append build interface include dirs to particular targets.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c4b16bec19dbacf1cb4d413771901da17eab2e1
commit 3c4b16bec19dbacf1cb4d413771901da17eab2e1
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Feb 7 19:35:00 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Feb 7 22:07:54 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.
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..52f6e03 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 =
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df74bc34d4219a8d6e63ec7e41a9ca4fbe355581
commit df74bc34d4219a8d6e63ec7e41a9ca4fbe355581
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Feb 7 19:31:23 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Feb 7 21:57:35 2013 +0100
Only append build interface include dirs to particular targets.
We shouldn't set the property on all custom targets.
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 08b3ef1..dd138a3 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -1150,9 +1150,10 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
("CMAKE_BUILD_INTERFACE_INCLUDES", cmProperty::VARIABLE,
"Automatically add the current source- and build directories "
"to the INTERFACE_INCLUDE_DIRECTORIES.",
- "If this variable is enabled, CMake automatically adds for each "
- "target ${CMAKE_CURRENT_SOURCE_DIR} and ${CMAKE_CURRENT_BINARY_DIR} "
- "to the INTERFACE_INCLUDE_DIRECTORIES."
+ "If this variable is enabled, CMake automatically adds for each shared "
+ "library target, static library target, module target and executable "
+ "target, ${CMAKE_CURRENT_SOURCE_DIR} and ${CMAKE_CURRENT_BINARY_DIR} to "
+ "the INTERFACE_INCLUDE_DIRECTORIES."
"By default CMAKE_BUILD_INTERFACE_INCLUDES is OFF.",
false,
"Variables that Control the Build");
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f55999f..2945173 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2714,6 +2714,13 @@ void cmTarget::AppendProperty(const char* prop, const
char* value,
//----------------------------------------------------------------------------
void cmTarget::AppendBuildInterfaceIncludes()
{
+ if(this->GetType() != cmTarget::SHARED_LIBRARY &&
+ this->GetType() != cmTarget::STATIC_LIBRARY &&
+ this->GetType() != cmTarget::MODULE_LIBRARY &&
+ !this->IsExecutableWithExports())
+ {
+ return;
+ }
if (this->BuildInterfaceIncludesAppended)
{
return;
-----------------------------------------------------------------------
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
