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 910ad89f3c556f8902e3206a620b9c867b6dcb39 (commit)
via 3851e0a2ca954a457ce93d52f4c727e18cb64c73 (commit)
via fecede0d9012f78470778cb049b2ab0231b4dcb7 (commit)
from 39a1e2569c3b45552927e83c35ace90dc84c98d2 (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=910ad89f3c556f8902e3206a620b9c867b6dcb39
commit 910ad89f3c556f8902e3206a620b9c867b6dcb39
Merge: 39a1e25 3851e0a
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Feb 7 13:40:42 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Feb 7 13:40:42 2013 -0500
Merge topic 'minor-fixes' into next
3851e0a Ensure that the build interface includes have been added.
fecede0 Only append build interface include dirs to particular targets.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3851e0a2ca954a457ce93d52f4c727e18cb64c73
commit 3851e0a2ca954a457ce93d52f4c727e18cb64c73
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 19:38:35 2013 +0100
Ensure that the build interface includes have been added.
This also means that we don't need to invoke AppendBuildInterfaceIncludes
in the GlobalGenerator.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index f7eff21..b8e1668 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -938,11 +938,6 @@ void cmGlobalGenerator::Generate()
(*targets)[tit->first] = tit->second;
(*targets)[tit->first].SetMakefile(mf);
}
-
- for ( tit = targets->begin(); tit != targets->end(); ++ tit )
- {
- tit->second.AppendBuildInterfaceIncludes();
- }
}
// Add generator specific helper commands
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 7497070..378c7b5 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2766,6 +2766,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=fecede0d9012f78470778cb049b2ab0231b4dcb7
commit fecede0d9012f78470778cb049b2ab0231b4dcb7
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 19:33:24 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..93a3ae0 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, 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..7497070 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2714,6 +2714,12 @@ void cmTarget::AppendProperty(const char* prop, const
char* value,
//----------------------------------------------------------------------------
void cmTarget::AppendBuildInterfaceIncludes()
{
+ if(this->GetType() != cmTarget::SHARED_LIBRARY &&
+ this->GetType() != cmTarget::MODULE_LIBRARY &&
+ !this->IsExecutableWithExports())
+ {
+ return;
+ }
if (this->BuildInterfaceIncludesAppended)
{
return;
-----------------------------------------------------------------------
Summary of changes:
Source/cmDocumentVariables.cxx | 7 ++++---
Source/cmGlobalGenerator.cxx | 5 -----
Source/cmTarget.cxx | 7 +++++++
3 files changed, 11 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
