[Cmake-commits] CMake branch, next, updated. v2.8.10.1-848-g08e1d26

[Alexander Neundorf]

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  08e1d26efad4cd1559e0102289d2c15c21067ba6 (commit)
       via  a9465098c01ace9ead62c04674dc2f4a529962f5 (commit)
      from  d93e9f61ab2424cc26d49c84c25ffb30c2deb0a4 (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=08e1d26efad4cd1559e0102289d2c15c21067ba6
commit 08e1d26efad4cd1559e0102289d2c15c21067ba6
Merge: d93e9f6 a946509
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Fri Nov 9 18:12:21 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 9 18:12:21 2012 -0500

    Merge topic 'FixAutomocRegression' into next
    
    a946509 automoc: fix regression from 2.8.10 (#13667 and #13646)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9465098c01ace9ead62c04674dc2f4a529962f5
commit a9465098c01ace9ead62c04674dc2f4a529962f5
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sat Nov 10 00:10:12 2012 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sat Nov 10 00:10:12 2012 +0100

    automoc: fix regression from 2.8.10 (#13667 and #13646)
    
    Some projects (kdelibs, phonon) query the compiler for its default
    include search dirs, and add those to
    CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES.
    These may include e.g./usr/lib/qt/include . This is typically also part
    of ${QT_INCLUDES}. If this directory is then contained in the implicit
    include dirs, it is removed from the include dirs returned from the
    target above. So we have to add them additionally, so moc can find them.
    Otherwise those projects don't build anymore, because moc can't find
    the headers it needs to find because the necessary include dirs
    have been removed.
    
    Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 942c7ab..6fae4e0 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -209,6 +209,22 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
     _moc_incs += *incDirIt;
     }
 
+  // Some projects (kdelibs, phonon) query the compiler for its default
+  // include search dirs, and add those to
+  // CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES.
+  // These may include e.g./usr/lib/qt/include . This is typically also part
+  // of ${QT_INCLUDES}. If this directory is then contained in the implicit
+  // include dirs, it is removed from the include dirs returned from the
+  // target above. So we have to add them additionally, so moc can find them.
+  // See #13646 and #13667.
+  const char* implicitIncludeDirs = makefile->GetSafeDefinition(
+                                     "CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES");
+  if (implicitIncludeDirs && *implicitIncludeDirs)
+    {
+    _moc_incs += sep;
+    _moc_incs += implicitIncludeDirs;
+    }
+
   const char* tmp = target->GetProperty("COMPILE_DEFINITIONS");
   std::string _moc_compile_defs = (tmp!=0 ? tmp : "");
   tmp = makefile->GetProperty("COMPILE_DEFINITIONS");

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

Summary of changes:
 Source/cmQtAutomoc.cxx |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake