[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2016-g5f456de

[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  5f456ded1e6426c57f82306f36a517875898a68a (commit)
       via  26147183b93dcf355815a1a0e39413453000d2a9 (commit)
       via  51bb509b52b51983b5e8c48f08cc23c7faaeb2f5 (commit)
      from  3efc38828749d34c1f2e3c87a031db3b85dece14 (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=5f456ded1e6426c57f82306f36a517875898a68a
commit 5f456ded1e6426c57f82306f36a517875898a68a
Merge: 3efc388 2614718
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 7 15:57:14 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 7 15:57:14 2013 -0500

    Merge topic 'minor-fixes' into next
    
    2614718 Restore appending build interface includes at generate time.
    51bb509 INTERFACE_INCLUDE_DIRECTORIES should also be populated for static libs.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26147183b93dcf355815a1a0e39413453000d2a9
commit 26147183b93dcf355815a1a0e39413453000d2a9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 7 21:56:08 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 7 21:56:08 2013 +0100

    Restore appending build interface includes at generate time.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index b8e1668..f7eff21 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -938,6 +938,11 @@ 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

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51bb509b52b51983b5e8c48f08cc23c7faaeb2f5
commit 51bb509b52b51983b5e8c48f08cc23c7faaeb2f5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 7 21:50:24 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 7 21:50:24 2013 +0100

    INTERFACE_INCLUDE_DIRECTORIES should also be populated for static libs.

diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 93a3ae0..dd138a3 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -1151,9 +1151,9 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
      "Automatically add the current source- and build directories "
      "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."
+     "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 378c7b5..52f6e03 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2715,6 +2715,7 @@ 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())
     {

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

Summary of changes:
 Source/cmDocumentVariables.cxx |    6 +++---
 Source/cmGlobalGenerator.cxx   |    5 +++++
 Source/cmTarget.cxx            |    1 +
 3 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake