diff options
| author | Evan Huus <eapache@gmail.com> | 2012-10-18 22:20:36 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2012-10-18 22:20:36 +0000 |
| commit | 97f5e101d99c1b6e7fdb2a4320e83ce7d20a3d7f (patch) | |
| tree | 94ca4cec36dd262157fc146efe928efa369c1f6f | |
| parent | 11aa25f668e88a121f7e299e7137a206a40d3178 (diff) | |
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
| -rw-r--r-- | cmakeconfig.h.in | 7 | ||||
| -rw-r--r-- | ui/qt/CMakeLists.txt | 3 |
2 files changed, 5 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} diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt index a671f95616..d16a27ecf6 100644 --- a/ui/qt/CMakeLists.txt +++ b/ui/qt/CMakeLists.txt @@ -34,6 +34,7 @@ set(QTSHARK_H_SRC display_filter_combo.h display_filter_edit.h export_dissection_dialog.h + export_object_dialog.h file_set_dialog.h import_text_dialog.h interface_tree.h @@ -69,6 +70,7 @@ set(QTSHARK_CPP_SRC display_filter_combo.cpp display_filter_edit.cpp export_dissection_dialog.cpp + export_object_dialog.cpp file_set_dialog.cpp import_text_dialog.cpp interface_tree.cpp @@ -100,6 +102,7 @@ set(QTSHARK_SRC set(QTSHARK_UI file_set_dialog.ui + export_object_dialog.ui import_text_dialog.ui main_welcome.ui main_window.ui |