Skip to content

Instantly share code, notes, and snippets.

@fran6co
Last active August 29, 2015 14:07
Show Gist options
  • Save fran6co/a6e1e44b1b43b2d150cd to your computer and use it in GitHub Desktop.
Save fran6co/a6e1e44b1b43b2d150cd to your computer and use it in GitHub Desktop.
diff --git a/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp b/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp
index 7863af4..2a3fe5b 100644
--- a/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp
+++ b/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp
@@ -33,9 +33,11 @@
*
*/
+#ifndef Q_MOC_RUN
#pragma once
#include <boost/thread/thread.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
+#endif
#include <pcl/apps/dominant_plane_segmentation.h>
#include <pcl/visualization/pcl_visualizer.h>
diff --git a/apps/include/pcl/apps/manual_registration.h b/apps/include/pcl/apps/manual_registration.h
index 8193428..99454c1 100644
--- a/apps/include/pcl/apps/manual_registration.h
+++ b/apps/include/pcl/apps/manual_registration.h
@@ -42,7 +42,9 @@
#include <QTimer>
// Boost
+#ifndef Q_MOC_RUN
#include <boost/thread/thread.hpp>
+#endif
// PCL
#include <pcl/console/print.h>
diff --git a/common/include/pcl/common/boost.h b/common/include/pcl/common/boost.h
index 2c38216..acc70af 100644
--- a/common/include/pcl/common/boost.h
+++ b/common/include/pcl/common/boost.h
@@ -43,6 +43,7 @@
#pragma GCC system_header
#endif
+#ifndef Q_MOC_RUN
// Marking all Boost headers as system headers to remove warnings
#include <boost/fusion/sequence/intrinsic/at_key.hpp>
#include <boost/shared_ptr.hpp>
@@ -56,5 +57,6 @@
#include <boost/signals2.hpp>
#include <boost/signals2/slot.hpp>
#include <boost/algorithm/string.hpp>
+#endif
#endif // PCL_COMMON_BOOST_H_
diff --git a/common/include/pcl/common/time.h b/common/include/pcl/common/time.h
index bb9fe06..7dab8b2 100644
--- a/common/include/pcl/common/time.h
+++ b/common/include/pcl/common/time.h
@@ -45,7 +45,9 @@
#include <cmath>
#include <string>
+#ifndef Q_MOC_RUN
#include <boost/date_time/posix_time/posix_time.hpp>
+#endif
/**
* \file pcl/common/time.h
diff --git a/common/include/pcl/common/time_trigger.h b/common/include/pcl/common/time_trigger.h
index 697d3af..941f96b 100644
--- a/common/include/pcl/common/time_trigger.h
+++ b/common/include/pcl/common/time_trigger.h
@@ -40,9 +40,11 @@
#define PCL_COMMON_TIME_TRIGGER_H_
#include <pcl/pcl_macros.h>
+#ifndef Q_MOC_RUN
#include <boost/function.hpp>
#include <boost/thread.hpp>
#include <boost/signals2.hpp>
+#endif
namespace pcl
{
diff --git a/common/include/pcl/console/time.h b/common/include/pcl/console/time.h
index 2fc031e..b5a91c3 100644
--- a/common/include/pcl/console/time.h
+++ b/common/include/pcl/console/time.h
@@ -42,7 +42,9 @@
#pragma GCC system_header
#endif
+#ifndef Q_MOC_RUN
#include <boost/date_time/posix_time/posix_time.hpp>
+#endif
#include <pcl/console/print.h>
namespace pcl
diff --git a/common/include/pcl/conversions.h b/common/include/pcl/conversions.h
index 13b883d..a5bf20b 100644
--- a/common/include/pcl/conversions.h
+++ b/common/include/pcl/conversions.h
@@ -52,7 +52,9 @@
#include <pcl/for_each_type.h>
#include <pcl/exceptions.h>
#include <pcl/console/print.h>
+#ifndef Q_MOC_RUN
#include <boost/foreach.hpp>
+#endif
namespace pcl
{
diff --git a/common/include/pcl/for_each_type.h b/common/include/pcl/for_each_type.h
index 4d05e04..d6973d4 100644
--- a/common/include/pcl/for_each_type.h
+++ b/common/include/pcl/for_each_type.h
@@ -44,6 +44,7 @@
#pragma GCC system_header
#endif
+#ifndef Q_MOC_RUN
#include <boost/mpl/is_sequence.hpp>
#include <boost/mpl/begin_end.hpp>
#include <boost/mpl/next_prior.hpp>
@@ -54,6 +55,7 @@
#include <boost/mpl/not.hpp>
#include <boost/mpl/aux_/unwrap.hpp>
#include <boost/type_traits/is_same.hpp>
+#endif
namespace pcl
{
diff --git a/common/include/pcl/register_point_struct.h b/common/include/pcl/register_point_struct.h
index 88a8135..f415f1d 100644
--- a/common/include/pcl/register_point_struct.h
+++ b/common/include/pcl/register_point_struct.h
@@ -53,6 +53,8 @@
#include <pcl/pcl_macros.h>
#include <pcl/point_traits.h>
+//https://bugreports.qt-project.org/browse/QTBUG-22829
+#ifndef Q_MOC_RUN
#include <boost/mpl/vector.hpp>
#include <boost/preprocessor/seq/enum.hpp>
#include <boost/preprocessor/seq/for_each.hpp>
@@ -60,8 +62,6 @@
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/comparison.hpp>
#include <boost/utility.hpp>
-//https://bugreports.qt-project.org/browse/QTBUG-22829
-#ifndef Q_MOC_RUN
#include <boost/type_traits.hpp>
#endif
#include <stddef.h> //offsetof
diff --git a/segmentation/include/pcl/segmentation/boost.h b/segmentation/include/pcl/segmentation/boost.h
index 32135b9..f2baa9f 100644
--- a/segmentation/include/pcl/segmentation/boost.h
+++ b/segmentation/include/pcl/segmentation/boost.h
@@ -45,6 +45,7 @@
#pragma GCC system_header
#endif
+#ifndef Q_MOC_RUN
// Marking all Boost headers as system headers to remove warnings
#include <boost/version.hpp>
#include <boost/make_shared.hpp>
@@ -55,6 +56,6 @@
#if (BOOST_VERSION >= 104400)
#include <boost/graph/boykov_kolmogorov_max_flow.hpp>
#endif
-
+#endif
#endif // PCL_SEGMENTATION_BOOST_H_
diff --git a/tools/boost.h b/tools/boost.h
index f85ef77..f1b44dc 100644
--- a/tools/boost.h
+++ b/tools/boost.h
@@ -45,6 +45,7 @@
#pragma GCC system_header
#endif
+#ifndef Q_MOC_RUN
// Marking all Boost headers as system headers to remove warnings
#include <boost/random.hpp>
#include <boost/random/normal_distribution.hpp>
@@ -57,5 +58,6 @@
#include <boost/thread/thread.hpp>
//#include <boost/uuid/uuid.hpp>
//#include <boost/uuid/uuid_generators.hpp>
+#endif
#endif // PCL_TOOLS_BOOST_H_
diff --git a/visualization/include/pcl/visualization/interactor_style.h b/visualization/include/pcl/visualization/interactor_style.h
index fa9bebb..c89bb2d 100644
--- a/visualization/include/pcl/visualization/interactor_style.h
+++ b/visualization/include/pcl/visualization/interactor_style.h
@@ -47,8 +47,9 @@
#include <pcl/visualization/mouse_event.h>
#include <pcl/visualization/point_picking_event.h>
#include <pcl/visualization/area_picking_event.h>
+#ifndef Q_MOC_RUN
#include <boost/signals2/signal.hpp>
-
+#endif
#include <vtkInteractorStyleRubberBandPick.h>
class vtkRendererCollection;
diff --git a/visualization/tools/image_viewer.cpp b/visualization/tools/image_viewer.cpp
index a8491f1..03f35dd 100644
--- a/visualization/tools/image_viewer.cpp
+++ b/visualization/tools/image_viewer.cpp
@@ -36,8 +36,10 @@
*
*/
+#ifndef Q_MOC_RUN
#include <boost/thread/thread.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
+#endif
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/common/time.h> //fps calculations
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment