[Cmake-commits] CMake branch, next, updated. v2.8.10.1-937-gdf01c8d

[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  df01c8d1a099316f9f3f164429d6209668c998a9 (commit)
       via  f43fb0236680fb06f4ef43ca0aaaeb1ef58e0118 (commit)
      from  3fa60c13e0710af68f1079712852f46ab18cc6e3 (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=df01c8d1a099316f9f3f164429d6209668c998a9
commit df01c8d1a099316f9f3f164429d6209668c998a9
Merge: 3fa60c1 f43fb02
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Mon Nov 19 15:16:58 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 19 15:16:58 2012 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f43fb0236680fb06f4ef43ca0aaaeb1ef58e0118
commit f43fb0236680fb06f4ef43ca0aaaeb1ef58e0118
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Mon Nov 19 21:13:43 2012 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Mon Nov 19 21:13:43 2012 +0100

    Revert "automoc: fix regression from 2.8.10 (#13667 and #13646)"
    
    This reverts commit a9465098c01ace9ead62c04674dc2f4a529962f5.
    
    Reverting this commit since it breaks moc, which can't handle all
    headers it finds now, see https://bugreports.qt-project.org/browse/QTBUG-28045
    https://bugreports.qt-project.org/browse/QTBUG-2804
    
    It seems it can't handle namespaces with attributes attached:
    namespace Something __attribute__ ((__visibility__ (default)))
    {
    
    }
    
    Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 6fae4e0..942c7ab 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -209,22 +209,6 @@ 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, 0 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
CMake