diff options
| author | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-09-28 15:30:36 +0000 |
|---|---|---|
| committer | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-09-28 15:30:36 +0000 |
| commit | 468f9f1fcf5a818d1615b3102f6324f67a0a825c (patch) | |
| tree | bcc211182c7c8361346a98be802ba49d5225bc76 /src | |
| parent | 4eb67582fc0aec86d56c5839ddcb5b0bf72e95b5 (diff) | |
Workaround for moc-qt4 failing to parse boost.
These should be removed when we move to Qt5.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@799 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 022769c3fcff955eba91c36cd27d2839702ec8dc
Diffstat (limited to 'src')
| -rw-r--r-- | src/GudhUI/gui/MainWindow.h | 2 | ||||
| -rw-r--r-- | src/GudhUI/gui/Menu_edge_contraction.h | 2 | ||||
| -rw-r--r-- | src/GudhUI/view/Viewer.h | 3 | ||||
| -rw-r--r-- | src/GudhUI/view/Viewer_instructor.h | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/src/GudhUI/gui/MainWindow.h b/src/GudhUI/gui/MainWindow.h index 587f1c6f..e46b72a3 100644 --- a/src/GudhUI/gui/MainWindow.h +++ b/src/GudhUI/gui/MainWindow.h @@ -1,6 +1,8 @@ #ifndef MAIN_WINDOW_H #define MAIN_WINDOW_H +// Workaround for moc-qt4 not parsing boost headers +#include <CGAL/config.h> #include <QMainWindow> #include "ui_main_window.h" diff --git a/src/GudhUI/gui/Menu_edge_contraction.h b/src/GudhUI/gui/Menu_edge_contraction.h index e497a90f..81d37bd8 100644 --- a/src/GudhUI/gui/Menu_edge_contraction.h +++ b/src/GudhUI/gui/Menu_edge_contraction.h @@ -8,6 +8,8 @@ #ifndef MENU_EDGE_CONTRACTION_H_ #define MENU_EDGE_CONTRACTION_H_ +// Workaround for moc-qt4 not parsing boost headers +#include <CGAL/config.h> #include "gui/MainWindow.h" #include "gui/ui_MenuEdgeContraction.h" diff --git a/src/GudhUI/view/Viewer.h b/src/GudhUI/view/Viewer.h index 5639aa56..00f9b245 100644 --- a/src/GudhUI/view/Viewer.h +++ b/src/GudhUI/view/Viewer.h @@ -1,6 +1,9 @@ #ifndef VIEWER_H
#define VIEWER_H
+// Workaround for moc-qt4 not parsing boost headers
+#include <CGAL/config.h>
+
#include <QGLViewer/qglviewer.h>
#include "View_parameter.h"
#include "model/Complex_typedefs.h"
diff --git a/src/GudhUI/view/Viewer_instructor.h b/src/GudhUI/view/Viewer_instructor.h index 9a2a236b..62b3755e 100644 --- a/src/GudhUI/view/Viewer_instructor.h +++ b/src/GudhUI/view/Viewer_instructor.h @@ -3,6 +3,8 @@ // todo do a viewer instructor that have directely a pointer to a QGLviewer and buffer ot not triangles
+// Workaround for moc-qt4 not parsing boost headers
+#include <CGAL/config.h>
#include <memory>
|