[Cmake-commits] CMake branch, next, updated. v2.8.12-4852-gf1d2121

[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  f1d21213598075eba43895bd6952afc20bc8ed4b (commit)
       via  11e93054a220d89e67d70839778ade3fb35e3c92 (commit)
      from  3770caf5567a392141c74c508f1c014c61f0af21 (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=f1d21213598075eba43895bd6952afc20bc8ed4b
commit f1d21213598075eba43895bd6952afc20bc8ed4b
Merge: 3770caf 11e9305
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 4 09:22:38 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 4 09:22:38 2013 -0500

    Merge topic 'fix-autogen-definitions' into next
    
    11e9305 Add unit test for the bug fix.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11e93054a220d89e67d70839778ade3fb35e3c92
commit 11e93054a220d89e67d70839778ade3fb35e3c92
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 4 15:21:48 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Nov 4 15:21:48 2013 +0100

    Add unit test for the bug fix.

diff --git a/Tests/QtAutogen/foo.h b/Tests/QtAutogen/foo.h
index 32d4c8d..f23ec07 100644
--- a/Tests/QtAutogen/foo.h
+++ b/Tests/QtAutogen/foo.h
@@ -16,7 +16,10 @@
 
 #include <QObject>
 
-class Foo : public QObject
+class Foo
+#ifdef FOO
+          : public QObject
+#endif
 {
   Q_OBJECT
   public:

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

Summary of changes:
 Tests/QtAutogen/foo.h |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake