Fix CMake build:

- add some new files to CMakeLists
- we do need _U_ for C++ now that we're sharing some headers between
  C and C++.

svn path=/trunk/; revision=45650

1 files changed, 2 insertions, 5 deletions

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index f8cd1cd0c5..1a0cfb18d3 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -391,8 +391,5 @@
 #cmakedefine YYTEXT_POINTER
 
 /* _U_ isn't needed for C++, simply don't name the variable.
-   Also, running moc with -D_U_... breaks cmake's auto escaping magic. */
-#ifndef __cplusplus
-# define _U_ ${C_UNUSED}
-#endif
-
+   However, we do need it for some headers that are shared between C and C++. */
+#define _U_ ${C_UNUSED}