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 31a91400888841a1dd89a02f5aeef9e1ca8785f7 (commit) via bc7560e6e56d1f6fa65745cf5c1206192fb77b04 (commit) via 30fd8e603a52b7230e0b716d8120fc01551c8a4f (commit) via 80dfbc99f4b04b5eaea9111fa014f07603a8db16 (commit) from a4d31477cfb1cc371e5d7387d742dbe6df838005 (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=31a91400888841a1dd89a02f5aeef9e1ca8785f7 commit 31a91400888841a1dd89a02f5aeef9e1ca8785f7 Merge: a4d3147 bc7560e Author: Alexander Neundorf <neund...@kde.org> AuthorDate: Tue Nov 22 14:57:04 2011 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Nov 22 14:57:04 2011 -0500 Merge topic 'AutomocIncludedDotMocFileHandling' into next bc7560e automoc: add test for including a moc_abc_p.cpp file 30fd8e6 automoc: add test for including the moc file from another header 80dfbc9 automoc: add a test for including both abc.moc and moc_abc.cpp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc7560e6e56d1f6fa65745cf5c1206192fb77b04 commit bc7560e6e56d1f6fa65745cf5c1206192fb77b04 Author: Alex Neundorf <neund...@kde.org> AuthorDate: Tue Nov 22 19:24:39 2011 +0100 Commit: Alex Neundorf <neund...@kde.org> CommitDate: Tue Nov 22 20:52:21 2011 +0100 automoc: add test for including a moc_abc_p.cpp file Alex diff --git a/Tests/QtAutomoc/abc.cpp b/Tests/QtAutomoc/abc.cpp index 25071cd..4bbc769 100644 --- a/Tests/QtAutomoc/abc.cpp +++ b/Tests/QtAutomoc/abc.cpp @@ -13,6 +13,7 @@ #include "abc.h" +#include "abc_p.h" #include <stdio.h> @@ -35,11 +36,14 @@ void Abc::doAbc() { PrintAbc pa; pa.print(); + AbcP abcP; + abcP.doAbcP(); } // check that including the moc file for the cpp file and the header works: #include "abc.moc" #include "moc_abc.cpp" +#include "moc_abc_p.cpp" // check that including a moc file from another header works: #include "moc_xyz.cpp" diff --git a/Tests/QtAutomoc/abc.cpp b/Tests/QtAutomoc/abc_p.h similarity index 62% copy from Tests/QtAutomoc/abc.cpp copy to Tests/QtAutomoc/abc_p.h index 25071cd..952fff3 100644 --- a/Tests/QtAutomoc/abc.cpp +++ b/Tests/QtAutomoc/abc_p.h @@ -11,35 +11,20 @@ See the License for more information. ============================================================================*/ +#ifndef ABC_P_H +#define ABC_P_H -#include "abc.h" +#include <QObject> #include <stdio.h> -class PrintAbc : public QObject +class AbcP : public QObject { Q_OBJECT public: - PrintAbc():QObject() {} + AbcP() {} public slots: - void print() const { printf("abc\n"); } + void doAbcP() { printf("I am private abc !\n"); } }; -Abc::Abc() -:QObject() -{ -} - - -void Abc::doAbc() -{ - PrintAbc pa; - pa.print(); -} - -// check that including the moc file for the cpp file and the header works: -#include "abc.moc" -#include "moc_abc.cpp" - -// check that including a moc file from another header works: -#include "moc_xyz.cpp" +#endif http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30fd8e603a52b7230e0b716d8120fc01551c8a4f commit 30fd8e603a52b7230e0b716d8120fc01551c8a4f Author: Alex Neundorf <neund...@kde.org> AuthorDate: Tue Nov 22 19:19:31 2011 +0100 Commit: Alex Neundorf <neund...@kde.org> CommitDate: Tue Nov 22 20:52:13 2011 +0100 automoc: add test for including the moc file from another header including moc_xyz.cpp in abc.cpp should run moc on xyz.h (and include the file in abc.cpp) Alex diff --git a/Tests/QtAutomoc/CMakeLists.txt b/Tests/QtAutomoc/CMakeLists.txt index c81ac11..9f02618 100644 --- a/Tests/QtAutomoc/CMakeLists.txt +++ b/Tests/QtAutomoc/CMakeLists.txt @@ -13,7 +13,7 @@ add_definitions(-DFOO) # create an executable and a library target, both requiring automoc: add_library(codeeditorLib STATIC codeeditor.cpp) -add_executable(foo main.cpp calwidget.cpp foo.cpp blub.cpp bar.cpp abc.cpp) +add_executable(foo main.cpp calwidget.cpp foo.cpp blub.cpp bar.cpp abc.cpp xyz.cpp) set_target_properties(foo codeeditorLib PROPERTIES AUTOMOC TRUE) diff --git a/Tests/QtAutomoc/abc.cpp b/Tests/QtAutomoc/abc.cpp index f922615..25071cd 100644 --- a/Tests/QtAutomoc/abc.cpp +++ b/Tests/QtAutomoc/abc.cpp @@ -37,5 +37,9 @@ void Abc::doAbc() pa.print(); } +// check that including the moc file for the cpp file and the header works: #include "abc.moc" #include "moc_abc.cpp" + +// check that including a moc file from another header works: +#include "moc_xyz.cpp" diff --git a/Tests/QtAutomoc/main.cpp b/Tests/QtAutomoc/main.cpp index 5414daf..7eb29a3 100644 --- a/Tests/QtAutomoc/main.cpp +++ b/Tests/QtAutomoc/main.cpp @@ -46,6 +46,7 @@ #include "blub.h" #include "sub/bar.h" #include "abc.h" +#include "xyz.h" int main(int argv, char **args) { @@ -70,5 +71,8 @@ int main(int argv, char **args) Abc abc; abc.doAbc(); + Xyz xyz; + xyz.doXyz(); + return app.exec(); } diff --git a/Tests/QtAutomoc/abc.cpp b/Tests/QtAutomoc/xyz.cpp similarity index 70% copy from Tests/QtAutomoc/abc.cpp copy to Tests/QtAutomoc/xyz.cpp index f922615..a3562a3 100644 --- a/Tests/QtAutomoc/abc.cpp +++ b/Tests/QtAutomoc/xyz.cpp @@ -12,30 +12,17 @@ ============================================================================*/ -#include "abc.h" +#include "xyz.h" #include <stdio.h> -class PrintAbc : public QObject -{ - Q_OBJECT - public: - PrintAbc():QObject() {} - public slots: - void print() const { printf("abc\n"); } -}; - -Abc::Abc() +Xyz::Xyz() :QObject() { } -void Abc::doAbc() +void Xyz::doXyz() { - PrintAbc pa; - pa.print(); + printf("This is xyz !\n"); } - -#include "abc.moc" -#include "moc_abc.cpp" diff --git a/Tests/QtAutomoc/abc.cpp b/Tests/QtAutomoc/xyz.h similarity index 70% copy from Tests/QtAutomoc/abc.cpp copy to Tests/QtAutomoc/xyz.h index f922615..8175d37 100644 --- a/Tests/QtAutomoc/abc.cpp +++ b/Tests/QtAutomoc/xyz.h @@ -11,31 +11,18 @@ See the License for more information. ============================================================================*/ +#ifndef XYZ_H +#define XYZ_H -#include "abc.h" +#include <QObject> -#include <stdio.h> - -class PrintAbc : public QObject +class Xyz : public QObject { Q_OBJECT public: - PrintAbc():QObject() {} + Xyz(); public slots: - void print() const { printf("abc\n"); } + void doXyz(); }; -Abc::Abc() -:QObject() -{ -} - - -void Abc::doAbc() -{ - PrintAbc pa; - pa.print(); -} - -#include "abc.moc" -#include "moc_abc.cpp" +#endif http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80dfbc99f4b04b5eaea9111fa014f07603a8db16 commit 80dfbc99f4b04b5eaea9111fa014f07603a8db16 Author: Alex Neundorf <neund...@kde.org> AuthorDate: Tue Nov 22 19:13:03 2011 +0100 Commit: Alex Neundorf <neund...@kde.org> CommitDate: Tue Nov 22 20:51:59 2011 +0100 automoc: add a test for including both abc.moc and moc_abc.cpp Alex diff --git a/Tests/QtAutomoc/CMakeLists.txt b/Tests/QtAutomoc/CMakeLists.txt index 9540e52..c81ac11 100644 --- a/Tests/QtAutomoc/CMakeLists.txt +++ b/Tests/QtAutomoc/CMakeLists.txt @@ -13,7 +13,7 @@ add_definitions(-DFOO) # create an executable and a library target, both requiring automoc: add_library(codeeditorLib STATIC codeeditor.cpp) -add_executable(foo main.cpp calwidget.cpp foo.cpp blub.cpp bar.cpp) +add_executable(foo main.cpp calwidget.cpp foo.cpp blub.cpp bar.cpp abc.cpp) set_target_properties(foo codeeditorLib PROPERTIES AUTOMOC TRUE) diff --git a/Tests/QtAutomoc/abc.cpp b/Tests/QtAutomoc/abc.cpp new file mode 100644 index 0000000..f922615 --- /dev/null +++ b/Tests/QtAutomoc/abc.cpp @@ -0,0 +1,41 @@ +/*============================================================================ + CMake - Cross Platform Makefile Generator + Copyright 2004-2011 Kitware, Inc. + Copyright 2011 Alexander Neundorf (neund...@kde.org) + + Distributed under the OSI-approved BSD License (the "License"); + see accompanying file Copyright.txt for details. + + This software is distributed WITHOUT ANY WARRANTY; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the License for more information. +============================================================================*/ + + +#include "abc.h" + +#include <stdio.h> + +class PrintAbc : public QObject +{ + Q_OBJECT + public: + PrintAbc():QObject() {} + public slots: + void print() const { printf("abc\n"); } +}; + +Abc::Abc() +:QObject() +{ +} + + +void Abc::doAbc() +{ + PrintAbc pa; + pa.print(); +} + +#include "abc.moc" +#include "moc_abc.cpp" diff --git a/Tests/QtAutomoc/abc.h b/Tests/QtAutomoc/abc.h new file mode 100644 index 0000000..d1924b0 --- /dev/null +++ b/Tests/QtAutomoc/abc.h @@ -0,0 +1,28 @@ +/*============================================================================ + CMake - Cross Platform Makefile Generator + Copyright 2004-2011 Kitware, Inc. + Copyright 2011 Alexander Neundorf (neund...@kde.org) + + Distributed under the OSI-approved BSD License (the "License"); + see accompanying file Copyright.txt for details. + + This software is distributed WITHOUT ANY WARRANTY; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the License for more information. +============================================================================*/ + +#ifndef ABC_H +#define ABC_H + +#include <QObject> + +class Abc : public QObject +{ + Q_OBJECT + public: + Abc(); + public slots: + void doAbc(); +}; + +#endif diff --git a/Tests/QtAutomoc/main.cpp b/Tests/QtAutomoc/main.cpp index 58e2a19..5414daf 100644 --- a/Tests/QtAutomoc/main.cpp +++ b/Tests/QtAutomoc/main.cpp @@ -45,6 +45,7 @@ #include "foo.h" #include "blub.h" #include "sub/bar.h" +#include "abc.h" int main(int argv, char **args) { @@ -66,5 +67,8 @@ int main(int argv, char **args) Bar bar; bar.doBar(); + Abc abc; + abc.doAbc(); + return app.exec(); } ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits