diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2010-05-15 13:43:01 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-05-15 13:43:01 +0000 |
| commit | 75df6d1e704079295be8e92abb205367738c66fe (patch) | |
| tree | 3191b61a4c734c876c9b16597e248494ca2c2d86 /dev-util/automoc/files | |
| parent | x86 stable, bug #318613 (diff) | |
| download | gentoo-2-75df6d1e704079295be8e92abb205367738c66fe.tar.gz gentoo-2-75df6d1e704079295be8e92abb205367738c66fe.tar.bz2 gentoo-2-75df6d1e704079295be8e92abb205367738c66fe.zip | |
Moved from kde-base/
(Portage version: 2.2_rc67/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'dev-util/automoc/files')
| -rw-r--r-- | dev-util/automoc/files/automoc-0.9.88-objc++.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/dev-util/automoc/files/automoc-0.9.88-objc++.patch b/dev-util/automoc/files/automoc-0.9.88-objc++.patch new file mode 100644 index 000000000000..1f4dacdc06eb --- /dev/null +++ b/dev-util/automoc/files/automoc-0.9.88-objc++.patch @@ -0,0 +1,48 @@ +Please refer to + http://websvn.kde.org/?view=revision&revision=934696 + +Adds support for objc++ in automoc, so that running moc on .mm-files will work. + +--- trunk/kdesupport/automoc/Automoc4Config.cmake 2009/03/03 15:40:57 934695 ++++ trunk/kdesupport/automoc/Automoc4Config.cmake 2009/03/03 15:42:18 934696 +@@ -105,9 +105,9 @@ + if(NOT _generated AND NOT _skip) + get_filename_component(_suffix "${_current_FILE}" EXT) + # skip every source file that's not C++ +- if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C") ++ if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm") + list(APPEND _moc_files ${_abs_current_FILE}) +- endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C") ++ endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm") + endif(NOT _generated AND NOT _skip) + endforeach (_current_FILE) + +@@ -156,7 +156,7 @@ + if(NOT _generated AND NOT _skip) + get_filename_component(_suffix "${_current_FILE}" EXT) + # skip every source file that's not C++ +- if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C") ++ if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm") + get_filename_component(_basename "${_current_FILE}" NAME_WE) + get_filename_component(_abs_path "${_abs_current_FILE}" PATH) + set(_header "${_abs_path}/${_basename}.h") +@@ -168,7 +168,7 @@ + list(APPEND _moc_headers ${_pheader}) + endif(EXISTS "${_pheader}") + list(APPEND _moc_files ${_abs_current_FILE}) +- endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C") ++ endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm") + endif(NOT _generated AND NOT _skip) + endforeach (_current_FILE) + +--- trunk/kdesupport/automoc/kde4automoc.cpp 2009/03/03 15:40:57 934695 ++++ trunk/kdesupport/automoc/kde4automoc.cpp 2009/03/03 15:42:18 934696 +@@ -326,7 +326,7 @@ + foreach (const QString &absFilename, sourceFiles) { + //qDebug() << absFilename; + const QFileInfo sourceFileInfo(absFilename); +- if (absFilename.endsWith(".cpp") || absFilename.endsWith(".cc") || ++ if (absFilename.endsWith(".cpp") || absFilename.endsWith(".cc") || absFilename.endsWith(".mm") || + absFilename.endsWith(".cxx") || absFilename.endsWith(".C")) { + //qDebug() << "check .cpp file"; + QFile sourceFile(absFilename); |