diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-10-02 13:13:38 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-10-02 13:13:38 +0000 |
| commit | c14909eae41883308428095758360de3a7202a0d (patch) | |
| tree | 6c3c40dbe6c006ec65a54a6373b5e6129012a4fb /src/GudhUI/view | |
| parent | 91b4846b860988f94346cdf1302c1cfd965c3d27 (diff) | |
Backmerge of trunk
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@820 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 812e0b84d187dd5e30a6a18c12612ebc9bf9206a
Diffstat (limited to 'src/GudhUI/view')
| -rw-r--r-- | src/GudhUI/view/Viewer.h | 3 | ||||
| -rw-r--r-- | src/GudhUI/view/Viewer_instructor.h | 2 |
2 files changed, 5 insertions, 0 deletions
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>
|