Bug#795525: marked as done (pcl: FTBFS with gcc5)

Debian Bug Tracking System Sun, 20 Sep 2015 15:09:53 -0700

Your message dated Sun, 20 Sep 2015 23:59:54 +0200
with message-id <20150920215954.ga19...@vis.informatik.uni-osnabrueck.de>
and subject line closes Bug
has caused the Debian Bug report #795525,
regarding pcl: FTBFS with gcc5
to be marked as done.


This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
795525: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=795525
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

--- Begin Message ---

Package: pcl
Version: 1.7.2-8
Severity: important
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Due to an incompatibility between Qt4 and boost+gcc5 [1], pcl fails to
build from source.  Attached is a patch I've applied in Ubuntu to fix this
(it's not the prettiest patch, I generated parts of it by script).  Thanks
for your consideration!

[1] https://bugreports.qt.io/browse/QTBUG-22829

-- 
-mt

Index: pcl-1.7.2/tools/boost.h
===================================================================
--- pcl-1.7.2.orig/tools/boost.h
+++ pcl-1.7.2/tools/boost.h
@@ -46,16 +46,38 @@
 #endif
 
 // Marking all Boost headers as system headers to remove warnings
+#ifndef Q_MOC_RUN
 #include <boost/random.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/random/normal_distribution.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/thread/thread.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/lexical_cast.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/make_shared.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/date_time/gregorian/gregorian_types.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/date_time/posix_time/posix_time.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/date_time/posix_time/posix_time_types.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/thread/thread.hpp>
+#endif
+#ifndef Q_MOC_RUN
 //#include <boost/uuid/uuid.hpp>
+#endif
+#ifndef Q_MOC_RUN
 //#include <boost/uuid/uuid_generators.hpp>
+#endif
 
 #endif    // PCL_TOOLS_BOOST_H_
Index: pcl-1.7.2/common/include/pcl/PCLHeader.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/PCLHeader.h
+++ pcl-1.7.2/common/include/pcl/PCLHeader.h
@@ -7,7 +7,9 @@
 
 #include <string>
 #include <vector>
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
 #include <pcl/pcl_macros.h>
 #include <ostream>
 
Index: pcl-1.7.2/common/include/pcl/PCLPointCloud2.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/PCLPointCloud2.h
+++ pcl-1.7.2/common/include/pcl/PCLPointCloud2.h
@@ -8,7 +8,9 @@
 #include <string>
 #include <vector>
 #include <ostream>
+#ifndef Q_MOC_RUN
 #include <boost/detail/endian.hpp>
+#endif
 
 // Include the correct Header path here
 #include <pcl/PCLHeader.h>
Index: pcl-1.7.2/common/include/pcl/PCLPointField.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/PCLPointField.h
+++ pcl-1.7.2/common/include/pcl/PCLPointField.h
@@ -8,7 +8,9 @@
 #include <string>
 #include <vector>
 #include <ostream>
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
 #include <pcl/pcl_macros.h>
 
 namespace pcl
Index: pcl-1.7.2/common/include/pcl/common/boost.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/common/boost.h
+++ pcl-1.7.2/common/include/pcl/common/boost.h
@@ -44,17 +44,41 @@
 #endif
 
 // Marking all Boost headers as system headers to remove warnings
+#ifndef Q_MOC_RUN
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/make_shared.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/size.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/date_time/posix_time/posix_time.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/function.hpp>
+#endif
+#ifndef Q_MOC_RUN
 //#include <boost/timer.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/thread.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/thread/condition.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/signals2.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/signals2/slot.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/algorithm/string.hpp>
+#endif
 
 #endif    // PCL_COMMON_BOOST_H_
Index: pcl-1.7.2/common/include/pcl/common/gaussian.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/common/gaussian.h
+++ pcl-1.7.2/common/include/pcl/common/gaussian.h
@@ -43,7 +43,9 @@
 #include <sstream>
 #include <pcl/common/eigen.h>
 #include <pcl/point_cloud.h>
+#ifndef Q_MOC_RUN
 #include <boost/function.hpp>
+#endif
 
 namespace pcl
 {
Index: pcl-1.7.2/common/include/pcl/common/random.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/common/random.h
+++ pcl-1.7.2/common/include/pcl/common/random.h
@@ -44,11 +44,21 @@
 #pragma GCC system_header 
 #endif
 
+#ifndef Q_MOC_RUN
 #include <boost/random/uniform_real.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/random/uniform_int.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/random/variate_generator.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/random/normal_distribution.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/random/mersenne_twister.hpp>
+#endif
 #include <pcl/pcl_macros.h>
 
 namespace pcl 
Index: pcl-1.7.2/common/include/pcl/common/time.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/common/time.h
+++ pcl-1.7.2/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
Index: pcl-1.7.2/common/include/pcl/common/time_trigger.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/common/time_trigger.h
+++ pcl-1.7.2/common/include/pcl/common/time_trigger.h
@@ -40,9 +40,15 @@
 #define PCL_COMMON_TIME_TRIGGER_H_
 
 #include <pcl/pcl_macros.h>
+#ifndef Q_MOC_RUN
 #include <boost/function.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/thread.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/signals2.hpp>
+#endif
 
 namespace pcl
 {
Index: pcl-1.7.2/common/include/pcl/console/time.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/console/time.h
+++ pcl-1.7.2/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
Index: pcl-1.7.2/common/include/pcl/conversions.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/conversions.h
+++ pcl-1.7.2/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
 {
Index: pcl-1.7.2/common/include/pcl/correspondence.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/correspondence.h
+++ pcl-1.7.2/common/include/pcl/correspondence.h
@@ -42,7 +42,9 @@
 #pragma GCC system_header 
 #endif
 
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
 #include <Eigen/StdVector>
 #include <Eigen/Geometry>
 #include <pcl/pcl_exports.h>
Index: pcl-1.7.2/common/include/pcl/exceptions.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/exceptions.h
+++ pcl-1.7.2/common/include/pcl/exceptions.h
@@ -40,7 +40,9 @@
 #include <stdexcept>
 #include <sstream>
 #include <pcl/pcl_macros.h>
+#ifndef Q_MOC_RUN
 #include <boost/current_function.hpp>
+#endif
 
 /** PCL_THROW_EXCEPTION a helper macro to be used for throwing exceptions.
   * This is an example on how to use:
Index: pcl-1.7.2/common/include/pcl/for_each_type.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/for_each_type.h
+++ pcl-1.7.2/common/include/pcl/for_each_type.h
@@ -44,16 +44,36 @@
 #pragma GCC system_header 
 #endif
 
+#ifndef Q_MOC_RUN
 #include <boost/mpl/is_sequence.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/begin_end.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/next_prior.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/deref.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/assert.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/remove_if.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/contains.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/not.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/aux_/unwrap.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/type_traits/is_same.hpp>
+#endif
 
 namespace pcl 
 {
Index: pcl-1.7.2/common/include/pcl/pcl_base.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/pcl_base.h
+++ pcl-1.7.2/common/include/pcl/pcl_base.h
@@ -45,7 +45,9 @@
 // Include PCL macros such as PCL_ERROR, etc
 #include <pcl/pcl_macros.h>
 
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
 #include <Eigen/StdVector>
 #include <Eigen/Core>
 
Index: pcl-1.7.2/common/include/pcl/pcl_macros.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/pcl_macros.h
+++ pcl-1.7.2/common/include/pcl/pcl_macros.h
@@ -38,7 +38,9 @@
 #define PCL_MACROS_H_
 
 #include <pcl/pcl_config.h>
+#ifndef Q_MOC_RUN
 #include <boost/cstdint.hpp>
+#endif
 #include <cstdlib>
 
 namespace pcl
Index: pcl-1.7.2/common/include/pcl/point_traits.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/point_traits.h
+++ pcl-1.7.2/common/include/pcl/point_traits.h
@@ -46,12 +46,20 @@
 #include "pcl/pcl_macros.h"
 
 #include <pcl/PCLPointField.h>
+#ifndef Q_MOC_RUN
 #include <boost/type_traits/remove_all_extents.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/type_traits/is_same.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/assert.hpp>
+#endif
 #if PCL_LINEAR_VERSION(__GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__) == PCL_LINEAR_VERSION(4,4,3)
+#ifndef Q_MOC_RUN
 #include <boost/mpl/bool.hpp>
 #endif
+#endif
 
 // This is required for the workaround at line 109
 #ifdef _MSC_VER
Index: pcl-1.7.2/common/include/pcl/point_types.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/point_types.h
+++ pcl-1.7.2/common/include/pcl/point_types.h
@@ -42,9 +42,15 @@
 #include <pcl/pcl_macros.h>
 #include <bitset>
 #include <pcl/register_point_struct.h>
+#ifndef Q_MOC_RUN
 #include <boost/mpl/contains.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/fold.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/vector.hpp>
+#endif
 
 /**
   * \file pcl/point_types.h
Index: pcl-1.7.2/common/include/pcl/register_point_struct.h
===================================================================
--- pcl-1.7.2.orig/common/include/pcl/register_point_struct.h
+++ pcl-1.7.2/common/include/pcl/register_point_struct.h
@@ -53,17 +53,33 @@
 
 #include <pcl/pcl_macros.h>
 #include <pcl/point_traits.h>
+#ifndef Q_MOC_RUN
 #include <boost/mpl/vector.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/preprocessor/seq/enum.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/preprocessor/seq/for_each.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/preprocessor/seq/transform.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/preprocessor/cat.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/preprocessor/comparison.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/utility.hpp>
+#endif
 //https://bugreports.qt-project.org/browse/QTBUG-22829
 #ifndef Q_MOC_RUN
+#ifndef Q_MOC_RUN
 #include <boost/type_traits.hpp>
 #endif
+#endif
 #include <stddef.h> //offsetof
 
 // Must be used in global namespace with name fully qualified
Index: pcl-1.7.2/io/include/pcl/compression/entropy_range_coder.h
===================================================================
--- pcl-1.7.2.orig/io/include/pcl/compression/entropy_range_coder.h
+++ pcl-1.7.2/io/include/pcl/compression/entropy_range_coder.h
@@ -48,7 +48,9 @@
 #include <cmath>
 #include <algorithm>
 #include <stdio.h>
+#ifndef Q_MOC_RUN
 #include <boost/cstdint.hpp>
+#endif
 
 namespace pcl
 {
Index: pcl-1.7.2/io/include/pcl/io/boost.h
===================================================================
--- pcl-1.7.2.orig/io/include/pcl/io/boost.h
+++ pcl-1.7.2/io/include/pcl/io/boost.h
@@ -44,39 +44,97 @@
 #ifndef __CUDACC__
 //https://bugreports.qt-project.org/browse/QTBUG-22829
 #ifndef Q_MOC_RUN
+#ifndef Q_MOC_RUN
 #include <boost/numeric/conversion/cast.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/thread/mutex.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/thread/condition.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/thread.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/thread/thread.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/filesystem.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/bind.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/cstdint.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/function.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/tuple/tuple.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/weak_ptr.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/fold.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/inherit.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/inherit_linearly.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/joint_view.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/transform.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/vector.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/algorithm/string.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/date_time/posix_time/posix_time.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/chrono.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/tokenizer.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/foreach.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/shared_array.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/interprocess/sync/file_lock.hpp>
+#endif
 #if BOOST_VERSION >= 104900
+#ifndef Q_MOC_RUN
 #include <boost/interprocess/permissions.hpp>
 #endif
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/iostreams/device/mapped_file.hpp>
+#endif
 #define BOOST_PARAMETER_MAX_ARITY 7
+#ifndef Q_MOC_RUN
 #include <boost/signals2.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/signals2/slot.hpp>
 #endif
 #endif
+#endif
 #endif    // _PCL_IO_BOOST_H_
 
Index: pcl-1.7.2/io/include/pcl/io/dinast_grabber.h
===================================================================
--- pcl-1.7.2.orig/io/include/pcl/io/dinast_grabber.h
+++ pcl-1.7.2/io/include/pcl/io/dinast_grabber.h
@@ -46,7 +46,9 @@
 #include <pcl/common/time.h>
 #include <pcl/console/print.h>
 #include <libusb-1.0/libusb.h>
+#ifndef Q_MOC_RUN
 #include <boost/circular_buffer.hpp>
+#endif
 
 namespace pcl
 {
Index: pcl-1.7.2/io/include/pcl/io/fotonic_grabber.h
===================================================================
--- pcl-1.7.2.orig/io/include/pcl/io/fotonic_grabber.h
+++ pcl-1.7.2/io/include/pcl/io/fotonic_grabber.h
@@ -42,11 +42,15 @@
 #define __PCL_IO_FOTONIC_GRABBER__
 
 #include <pcl/io/eigen.h>
+#ifndef Q_MOC_RUN
 #include <pcl/io/boost.h>
+#endif
 #include <pcl/io/grabber.h>
 #include <pcl/common/synchronizer.h>
 
+#ifndef Q_MOC_RUN
 #include <boost/thread.hpp>  
+#endif
 
 #include <fz_api.h>
 
Index: pcl-1.7.2/io/include/pcl/io/hdl_grabber.h
===================================================================
--- pcl-1.7.2.orig/io/include/pcl/io/hdl_grabber.h
+++ pcl-1.7.2/io/include/pcl/io/hdl_grabber.h
@@ -44,7 +44,9 @@
 #include <pcl/io/impl/synchronized_queue.hpp>
 #include <pcl/point_types.h>
 #include <pcl/point_cloud.h>
+#ifndef Q_MOC_RUN
 #include <boost/asio.hpp>
+#endif
 #include <string>
 
 #define HDL_Grabber_toRadians(x) ((x) * M_PI / 180.0)
Index: pcl-1.7.2/io/include/pcl/io/image.h
===================================================================
--- pcl-1.7.2.orig/io/include/pcl/io/image.h
+++ pcl-1.7.2/io/include/pcl/io/image.h
@@ -38,8 +38,12 @@
 #define PCL_IO_IMAGE_H_
 
 #include <pcl/pcl_exports.h>
+#ifndef Q_MOC_RUN
 #include <pcl/io/boost.h>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/chrono.hpp>
+#endif
 
 #include <pcl/io/image_metadata_wrapper.h>
 
Index: pcl-1.7.2/io/include/pcl/io/image_depth.h
===================================================================
--- pcl-1.7.2.orig/io/include/pcl/io/image_depth.h
+++ pcl-1.7.2/io/include/pcl/io/image_depth.h
@@ -42,8 +42,12 @@
 #define PCL_IO_IMAGE_DEPTH_H_
 
 #include <pcl/pcl_exports.h>
+#ifndef Q_MOC_RUN
 #include <pcl/io/boost.h>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/chrono.hpp>
+#endif
 
 #include<pcl/io/image_metadata_wrapper.h>
 
Index: pcl-1.7.2/io/include/pcl/io/image_rgb24.h
===================================================================
--- pcl-1.7.2.orig/io/include/pcl/io/image_rgb24.h
+++ pcl-1.7.2/io/include/pcl/io/image_rgb24.h
@@ -39,7 +39,9 @@
 #define PCL_IO_IMAGE_RGB_H_
 
 #include <pcl/pcl_macros.h>
+#ifndef Q_MOC_RUN
 #include <boost/chrono.hpp>
+#endif
 
 #include <pcl/io/image.h>
 
Index: pcl-1.7.2/io/include/pcl/io/openni2/openni2_device.h
===================================================================
--- pcl-1.7.2.orig/io/include/pcl/io/openni2/openni2_device.h
+++ pcl-1.7.2/io/include/pcl/io/openni2/openni2_device.h
@@ -36,10 +36,18 @@
 #include "pcl/io/openni2/openni2_video_mode.h"
 #include "pcl/io/io_exception.h"
 
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/cstdint.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/bind.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/function.hpp>
+#endif
 #include <string>
 #include <vector>
 
Index: pcl-1.7.2/io/include/pcl/io/openni2/openni2_device_info.h
===================================================================
--- pcl-1.7.2.orig/io/include/pcl/io/openni2/openni2_device_info.h
+++ pcl-1.7.2/io/include/pcl/io/openni2/openni2_device_info.h
@@ -34,7 +34,9 @@
 
 #include <ostream>
 
+#ifndef Q_MOC_RUN
 #include <boost/cstdint.hpp>
+#endif
 
 namespace pcl
 {
Index: pcl-1.7.2/io/include/pcl/io/openni2/openni2_device_manager.h
===================================================================
--- pcl-1.7.2.orig/io/include/pcl/io/openni2/openni2_device_manager.h
+++ pcl-1.7.2/io/include/pcl/io/openni2/openni2_device_manager.h
@@ -35,9 +35,15 @@
 #include <pcl/pcl_exports.h>
 #include "pcl/io/openni2/openni2_device_info.h"
 
+#ifndef Q_MOC_RUN
 #include <boost/thread/mutex.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/make_shared.hpp>
+#endif
 
 #include <vector>
 #include <string>
Index: pcl-1.7.2/io/include/pcl/io/openni2/openni2_frame_listener.h
===================================================================
--- pcl-1.7.2.orig/io/include/pcl/io/openni2/openni2_frame_listener.h
+++ pcl-1.7.2/io/include/pcl/io/openni2/openni2_frame_listener.h
@@ -38,7 +38,9 @@
 #ifndef PCL_IO_OPENNI2_FRAME_LISTENER_H_
 #define PCL_IO_OPENNI2_FRAME_LISTENER_H_
 
+#ifndef Q_MOC_RUN
 #include <boost/function.hpp>
+#endif
 
 #include "OpenNI.h"
 
Index: pcl-1.7.2/io/include/pcl/io/ply/byte_order.h
===================================================================
--- pcl-1.7.2.orig/io/include/pcl/io/ply/byte_order.h
+++ pcl-1.7.2/io/include/pcl/io/ply/byte_order.h
@@ -40,7 +40,9 @@
 #ifndef PCL_IO_PLY_BYTE_ORDER_H
 #define PCL_IO_PLY_BYTE_ORDER_H
 
+#ifndef Q_MOC_RUN
 #include <boost/detail/endian.hpp>
+#endif
 
 namespace pcl
 {
Index: pcl-1.7.2/io/include/pcl/io/pxc_grabber.h
===================================================================
--- pcl-1.7.2.orig/io/include/pcl/io/pxc_grabber.h
+++ pcl-1.7.2/io/include/pcl/io/pxc_grabber.h
@@ -43,11 +43,15 @@
 #define __PCL_IO_PXC_GRABBER__
 
 #include <pcl/io/eigen.h>
+#ifndef Q_MOC_RUN
 #include <pcl/io/boost.h>
+#endif
 #include <pcl/io/grabber.h>
 #include <pcl/common/synchronizer.h>
 
+#ifndef Q_MOC_RUN
 #include <boost/thread.hpp>  
+#endif
 
 #include "pxcsmartptr.h"
 #include "pxcsession.h"
Index: pcl-1.7.2/io/include/pcl/io/robot_eye_grabber.h
===================================================================
--- pcl-1.7.2.orig/io/include/pcl/io/robot_eye_grabber.h
+++ pcl-1.7.2/io/include/pcl/io/robot_eye_grabber.h
@@ -44,8 +44,12 @@
 #include <pcl/io/impl/synchronized_queue.hpp>
 #include <pcl/point_types.h>
 #include <pcl/point_cloud.h>
+#ifndef Q_MOC_RUN
 #include <boost/asio.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/thread/thread.hpp>
+#endif
 
 namespace pcl
 {
Index: pcl-1.7.2/recognition/include/pcl/recognition/boost.h
===================================================================
--- pcl-1.7.2.orig/recognition/include/pcl/recognition/boost.h
+++ pcl-1.7.2/recognition/include/pcl/recognition/boost.h
@@ -44,8 +44,14 @@
 #  pragma GCC system_header 
 #endif
 
+#ifndef Q_MOC_RUN
 #include <boost/unordered_map.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/graph/graph_traits.hpp>
+#endif
+#ifndef Q_MOC_RUN
 //#include <boost/graph/adjacency_list.hpp>
+#endif
 
 #endif    // PCL_RECOGNITION_BOOST_H_
Index: pcl-1.7.2/recognition/include/pcl/recognition/hv/hv_go.h
===================================================================
--- pcl-1.7.2.orig/recognition/include/pcl/recognition/hv/hv_go.h
+++ pcl-1.7.2/recognition/include/pcl/recognition/hv/hv_go.h
@@ -13,8 +13,12 @@
 #include <pcl/common/common.h>
 #include "metslib/mets.hh"
 #include <pcl/features/normal_3d.h>
+#ifndef Q_MOC_RUN
 #include <boost/graph/graph_traits.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/graph/adjacency_list.hpp>
+#endif
 
 namespace pcl
 {
Index: pcl-1.7.2/recognition/include/pcl/recognition/hv/hv_papazov.h
===================================================================
--- pcl-1.7.2.orig/recognition/include/pcl/recognition/hv/hv_papazov.h
+++ pcl-1.7.2/recognition/include/pcl/recognition/hv/hv_papazov.h
@@ -37,11 +37,15 @@
 #ifndef PCL_RECOGNITION_HV_PAPAZOV_H_
 #define PCL_RECOGNITION_HV_PAPAZOV_H_
 
+#ifndef Q_MOC_RUN
 #include <pcl/recognition/boost.h>
+#endif
 #include <pcl/pcl_macros.h>
 #include <pcl/common/common.h>
 #include <pcl/recognition/hv/hypotheses_verification.h>
+#ifndef Q_MOC_RUN
 #include <boost/graph/adjacency_list.hpp>
+#endif
 
 namespace pcl
 {
Index: pcl-1.7.2/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/boost.h
===================================================================
--- pcl-1.7.2.orig/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/boost.h
+++ pcl-1.7.2/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/boost.h
@@ -45,15 +45,35 @@
 #  pragma GCC system_header
 #endif
 
+#ifndef Q_MOC_RUN
 #include <boost/static_assert.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/unordered_map.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/bind/bind.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/math/special_functions/fpclassify.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/signals2/connection.hpp>
+#endif
+#ifndef Q_MOC_RUN
 //#include <boost/signals2/signal.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/thread/mutex.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/thread/thread.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/type_traits/is_same.hpp>
+#endif
 
 #endif // PCL_APPS_IN_HAND_SCANNER_BOOST_H
Index: pcl-1.7.2/apps/include/pcl/apps/manual_registration.h
===================================================================
--- pcl-1.7.2.orig/apps/include/pcl/apps/manual_registration.h
+++ pcl-1.7.2/apps/include/pcl/apps/manual_registration.h
@@ -34,6 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef Q_MOC_RUN
 #include <ui_manual_registration.h>
 
 // QT4
@@ -63,6 +64,7 @@
 #include <pcl/visualization/point_cloud_handlers.h>
 
 #include <pcl/registration/transformation_estimation_svd.h>
+#endif
 
 typedef pcl::PointXYZRGBA PointT;
 
Index: pcl-1.7.2/apps/include/pcl/apps/nn_classification.h
===================================================================
--- pcl-1.7.2.orig/apps/include/pcl/apps/nn_classification.h
+++ pcl-1.7.2/apps/include/pcl/apps/nn_classification.h
@@ -43,8 +43,12 @@
 #include <cstdlib>
 #include <cfloat>
 #include <algorithm>
+#ifndef Q_MOC_RUN
 #include <boost/foreach.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
 #include <pcl/kdtree/kdtree_flann.h>
 
 namespace pcl
Index: pcl-1.7.2/apps/include/pcl/apps/organized_segmentation_demo.h
===================================================================
--- pcl-1.7.2.orig/apps/include/pcl/apps/organized_segmentation_demo.h
+++ pcl-1.7.2/apps/include/pcl/apps/organized_segmentation_demo.h
@@ -37,10 +37,12 @@
 #ifndef PCL_ORGANIZED_SEGMENTATION_DEMO_H_
 #define PCL_ORGANIZED_SEGMENTATION_DEMO_H_
 
+#ifndef Q_MOC_RUN
 #include <pcl/apps/organized_segmentation_demo_qt.h>
 
 // Boost
 #include <boost/thread/thread.hpp>
+
 // PCL
 #include <pcl/point_cloud.h>
 #include <pcl/point_types.h>
@@ -61,6 +63,7 @@
 #include <pcl/segmentation/edge_aware_plane_comparator.h>
 #include <pcl/segmentation/euclidean_cluster_comparator.h>
 #include <pcl/segmentation/organized_connected_component_segmentation.h>
+#endif
 
 typedef pcl::PointXYZRGBA PointT;
 
Index: pcl-1.7.2/apps/include/pcl/apps/pcd_video_player.h
===================================================================
--- pcl-1.7.2.orig/apps/include/pcl/apps/pcd_video_player.h
+++ pcl-1.7.2/apps/include/pcl/apps/pcd_video_player.h
@@ -45,6 +45,7 @@
 #include <QTimer>
 
 // Boost
+#ifndef Q_MOC_RUN
 #include <boost/thread/thread.hpp>
 #include <boost/filesystem.hpp>
 
@@ -67,6 +68,7 @@
 #include <pcl/visualization/point_cloud_handlers.h>
 
 #include <pcl/registration/transformation_estimation_svd.h>
+#endif
 
 #define CURRENT_VERSION 0.2
 
Index: pcl-1.7.2/apps/include/pcl/apps/render_views_tesselated_sphere.h
===================================================================
--- pcl-1.7.2.orig/apps/include/pcl/apps/render_views_tesselated_sphere.h
+++ pcl-1.7.2/apps/include/pcl/apps/render_views_tesselated_sphere.h
@@ -11,7 +11,9 @@
 #include <vtkSmartPointer.h>
 #include <vtkPolyData.h>
 #include <pcl/common/common.h>
+#ifndef Q_MOC_RUN
 #include <boost/function.hpp>
+#endif
 
 namespace pcl
 {
Index: pcl-1.7.2/apps/modeler/include/pcl/apps/modeler/channel_actor_item.h
===================================================================
--- pcl-1.7.2.orig/apps/modeler/include/pcl/apps/modeler/channel_actor_item.h
+++ pcl-1.7.2/apps/modeler/include/pcl/apps/modeler/channel_actor_item.h
@@ -37,7 +37,9 @@
 #define PCL_MODELER_CHANNEL_ACTOR_ITEM_H_
 
 #include <vtkSmartPointer.h>
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
 #include <pcl/common/eigen.h>
 #include <pcl/apps/modeler/qt.h>
 #include <pcl/apps/modeler/abstract_item.h>
Index: pcl-1.7.2/apps/modeler/include/pcl/apps/modeler/cloud_mesh_item.h
===================================================================
--- pcl-1.7.2.orig/apps/modeler/include/pcl/apps/modeler/cloud_mesh_item.h
+++ pcl-1.7.2/apps/modeler/include/pcl/apps/modeler/cloud_mesh_item.h
@@ -37,7 +37,9 @@
 #define PCL_MODELER_CLOUD_MESH_ITEM_H_
 
 #include <pcl/apps/modeler/qt.h>
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
 #include <pcl/apps/modeler/abstract_item.h>
 #include <pcl/apps/modeler/cloud_mesh.h>
 
Index: pcl-1.7.2/apps/modeler/include/pcl/apps/modeler/main_window.h
===================================================================
--- pcl-1.7.2.orig/apps/modeler/include/pcl/apps/modeler/main_window.h
+++ pcl-1.7.2/apps/modeler/include/pcl/apps/modeler/main_window.h
@@ -38,7 +38,9 @@
 #define PCL_MODELER_MAIN_WINDOW_H_
 
 #include <pcl/apps/modeler/qt.h>
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
 
 #include <ui_main_window.h>
 
Index: pcl-1.7.2/apps/modeler/include/pcl/apps/modeler/parameter.h
===================================================================
--- pcl-1.7.2.orig/apps/modeler/include/pcl/apps/modeler/parameter.h
+++ pcl-1.7.2/apps/modeler/include/pcl/apps/modeler/parameter.h
@@ -39,7 +39,9 @@
 #include <map>
 #include <string>
 
+#ifndef Q_MOC_RUN
 #include <boost/any.hpp>
+#endif
 #include <pcl/apps/modeler/qt.h>
 
 
Index: pcl-1.7.2/apps/optronic_viewer/include/pcl/apps/optronic_viewer/cloud_filter.h
===================================================================
--- pcl-1.7.2.orig/apps/optronic_viewer/include/pcl/apps/optronic_viewer/cloud_filter.h
+++ pcl-1.7.2/apps/optronic_viewer/include/pcl/apps/optronic_viewer/cloud_filter.h
@@ -39,7 +39,9 @@
 #define PCL_APPS_OPTRONIC_VIEWER_CLOUD_FILTER_H_
 
 #include <pcl/apps/optronic_viewer/qt.h>
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
 #include <pcl/io/openni_grabber.h>
 
 #include <pcl/visualization/pcl_visualizer.h>
Index: pcl-1.7.2/apps/optronic_viewer/include/pcl/apps/optronic_viewer/filter_window.h
===================================================================
--- pcl-1.7.2.orig/apps/optronic_viewer/include/pcl/apps/optronic_viewer/filter_window.h
+++ pcl-1.7.2/apps/optronic_viewer/include/pcl/apps/optronic_viewer/filter_window.h
@@ -38,7 +38,9 @@
 #ifndef PCL_APPS_OPTRONIC_VIEWER_FILTER_WINDOW_H_
 #define PCL_APPS_OPTRONIC_VIEWER_FILTER_WINDOW_H_
 
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
 
 #include <pcl/apps/optronic_viewer/qt.h>
 #include <pcl/apps/optronic_viewer/openni_grabber.h>
Index: pcl-1.7.2/apps/optronic_viewer/include/pcl/apps/optronic_viewer/main_window.h
===================================================================
--- pcl-1.7.2.orig/apps/optronic_viewer/include/pcl/apps/optronic_viewer/main_window.h
+++ pcl-1.7.2/apps/optronic_viewer/include/pcl/apps/optronic_viewer/main_window.h
@@ -38,7 +38,9 @@
 #ifndef PCL_APPS_OPTRONIC_VIEWER_MAIN_WINDOW_H_
 #define PCL_APPS_OPTRONIC_VIEWER_MAIN_WINDOW_H_
 
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
 
 #include <pcl/apps/optronic_viewer/qt.h>
 #include <pcl/apps/optronic_viewer/openni_grabber.h>
Index: pcl-1.7.2/apps/optronic_viewer/include/pcl/apps/optronic_viewer/openni_grabber.h
===================================================================
--- pcl-1.7.2.orig/apps/optronic_viewer/include/pcl/apps/optronic_viewer/openni_grabber.h
+++ pcl-1.7.2/apps/optronic_viewer/include/pcl/apps/optronic_viewer/openni_grabber.h
@@ -39,7 +39,9 @@
 #define PCL_APPS_OPTRONIC_VIEWER_OPENNI_GRABBER_H_
 
 #include <pcl/apps/optronic_viewer/qt.h>
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
 #include <pcl/io/openni_grabber.h>
 
 #include <pcl/visualization/pcl_visualizer.h>
Index: pcl-1.7.2/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/cloudEditorWidget.h
===================================================================
--- pcl-1.7.2.orig/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/cloudEditorWidget.h
+++ pcl-1.7.2/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/cloudEditorWidget.h
@@ -42,7 +42,9 @@
 #define CLOUD_EDITOR_WIDGET_H_
 
 #include <QGLWidget>
+#ifndef Q_MOC_RUN
 #include <boost/function.hpp>
+#endif
 #include <pcl/apps/point_cloud_editor/localTypes.h>
 #include <pcl/apps/point_cloud_editor/common.h>
 #include <pcl/apps/point_cloud_editor/commandQueue.h>
Index: pcl-1.7.2/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/localTypes.h
===================================================================
--- pcl-1.7.2.orig/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/localTypes.h
+++ pcl-1.7.2/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/localTypes.h
@@ -42,8 +42,12 @@
 #define LOCAL_TYPES_H_
 
 #include <vector>
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/weak_ptr.hpp>
+#endif
 #include <pcl/point_types.h>
 #include <pcl/point_cloud.h>
 
Index: pcl-1.7.2/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/trackball.h
===================================================================
--- pcl-1.7.2.orig/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/trackball.h
+++ pcl-1.7.2/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/trackball.h
@@ -41,7 +41,9 @@
 #ifndef TRACKBALL_H_
 #define TRACKBALL_H_
 
+#ifndef Q_MOC_RUN
 #include <boost/math/quaternion.hpp>
+#endif
 #include <pcl/apps/point_cloud_editor/localTypes.h>
 
 class TrackBall
Index: pcl-1.7.2/features/include/pcl/features/boost.h
===================================================================
--- pcl-1.7.2.orig/features/include/pcl/features/boost.h
+++ pcl-1.7.2/features/include/pcl/features/boost.h
@@ -44,12 +44,26 @@
 #  pragma GCC system_header 
 #endif
 
+#ifndef Q_MOC_RUN
 #include <boost/unordered_map.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/function.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/bind.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/random.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/property_map/property_map.hpp>
+#endif
+#ifndef Q_MOC_RUN
 //#include <boost/graph/adjacency_list.hpp>
+#endif
+#ifndef Q_MOC_RUN
 //#include <boost/graph/johnson_all_pairs_shortest.hpp>
+#endif
 
 #endif    // PCL_FEATURES_BOOST_H_
Index: pcl-1.7.2/features/include/pcl/features/feature.h
===================================================================
--- pcl-1.7.2.orig/features/include/pcl/features/feature.h
+++ pcl-1.7.2/features/include/pcl/features/feature.h
@@ -45,8 +45,12 @@
 #  pragma GCC system_header 
 #endif
 
+#ifndef Q_MOC_RUN
 #include <boost/function.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/bind.hpp>
+#endif
 // PCL includes
 #include <pcl/pcl_base.h>
 #include <pcl/search/search.h>
Index: pcl-1.7.2/segmentation/include/pcl/segmentation/boost.h
===================================================================
--- pcl-1.7.2.orig/segmentation/include/pcl/segmentation/boost.h
+++ pcl-1.7.2/segmentation/include/pcl/segmentation/boost.h
@@ -46,14 +46,26 @@
 #endif
 
 // Marking all Boost headers as system headers to remove warnings
+#ifndef Q_MOC_RUN
 #include <boost/version.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/make_shared.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/graph/adjacency_list.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/multi_array.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/ptr_container/ptr_list.hpp>
+#endif
 
 #if (BOOST_VERSION >= 104400) 
+#ifndef Q_MOC_RUN
   #include <boost/graph/boykov_kolmogorov_max_flow.hpp>
+#endif
 #endif 
 
 
Index: pcl-1.7.2/segmentation/include/pcl/segmentation/ground_plane_comparator.h
===================================================================
--- pcl-1.7.2.orig/segmentation/include/pcl/segmentation/ground_plane_comparator.h
+++ pcl-1.7.2/segmentation/include/pcl/segmentation/ground_plane_comparator.h
@@ -42,7 +42,9 @@
 
 #include <pcl/common/angles.h>
 #include <pcl/segmentation/comparator.h>
+#ifndef Q_MOC_RUN
 #include <boost/make_shared.hpp>
+#endif
 
 namespace pcl
 {
Index: pcl-1.7.2/outofcore/include/pcl/outofcore/boost.h
===================================================================
--- pcl-1.7.2.orig/outofcore/include/pcl/outofcore/boost.h
+++ pcl-1.7.2/outofcore/include/pcl/outofcore/boost.h
@@ -43,16 +43,38 @@
 #  pragma GCC system_header 
 #endif
 
+#ifndef Q_MOC_RUN
 #include <boost/filesystem.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/thread.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/random/uniform_int.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/uuid/uuid.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/uuid/uuid_generators.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/uuid/uuid_io.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/random/mersenne_twister.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/random/uniform_int.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/random/bernoulli_distribution.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/foreach.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/lexical_cast.hpp>
+#endif
 
 #endif //PCL_OUTOFCORE_BOOST_H_
Index: pcl-1.7.2/outofcore/include/pcl/outofcore/visualization/object.h
===================================================================
--- pcl-1.7.2.orig/outofcore/include/pcl/outofcore/visualization/object.h
+++ pcl-1.7.2/outofcore/include/pcl/outofcore/visualization/object.h
@@ -13,9 +13,15 @@
 #include <vtkSmartPointer.h>
 
 // Boost
+#ifndef Q_MOC_RUN
 //#include <boost/date_time.hpp>
+#endif
+#ifndef Q_MOC_RUN
 //#include <boost/filesystem.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/thread.hpp>
+#endif
 
 //Forward Declaration
 class Scene;
Index: pcl-1.7.2/filters/include/pcl/filters/boost.h
===================================================================
--- pcl-1.7.2.orig/filters/include/pcl/filters/boost.h
+++ pcl-1.7.2/filters/include/pcl/filters/boost.h
@@ -46,16 +46,38 @@
 #endif
 
 // Marking all Boost headers as system headers to remove warnings
+#ifndef Q_MOC_RUN
 #include <boost/random.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/random/normal_distribution.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/make_shared.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/dynamic_bitset.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/mpl/size.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/unordered_map.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/bind.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/function.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/optional.hpp>
+#endif
 
 #endif    // PCL_FILTERS_BOOST_H_
Index: pcl-1.7.2/sample_consensus/include/pcl/sample_consensus/boost.h
===================================================================
--- pcl-1.7.2.orig/sample_consensus/include/pcl/sample_consensus/boost.h
+++ pcl-1.7.2/sample_consensus/include/pcl/sample_consensus/boost.h
@@ -44,6 +44,8 @@
 #  pragma GCC system_header 
 #endif
 
+#ifndef Q_MOC_RUN
 #include <boost/random.hpp>
+#endif
 
 #endif    // PCL_SAMPLE_CONSENSUS_BOOST_H_
Index: pcl-1.7.2/registration/include/pcl/registration/boost.h
===================================================================
--- pcl-1.7.2.orig/registration/include/pcl/registration/boost.h
+++ pcl-1.7.2/registration/include/pcl/registration/boost.h
@@ -44,15 +44,33 @@
 #  pragma GCC system_header 
 #endif
 
+#ifndef Q_MOC_RUN
 //#include <boost/graph/adjacency_list.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/graph/graph_traits.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/graph/dijkstra_shortest_paths.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/property_map/property_map.hpp>
+#endif
 
+#ifndef Q_MOC_RUN
 #include <boost/unordered_map.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/noncopyable.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/make_shared.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/function.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/bind.hpp>
+#endif
 
 #endif    // PCL_REGISTRATION_BOOST_H_
Index: pcl-1.7.2/registration/include/pcl/registration/boost_graph.h
===================================================================
--- pcl-1.7.2.orig/registration/include/pcl/registration/boost_graph.h
+++ pcl-1.7.2/registration/include/pcl/registration/boost_graph.h
@@ -40,7 +40,9 @@
 #ifndef PCL_REGISTRATION_BOOST_GRAPH_H_
 #define PCL_REGISTRATION_BOOST_GRAPH_H_
 
+#ifndef Q_MOC_RUN
 #include <boost/graph/adjacency_list.hpp>
+#endif
 #include <Eigen/StdVector>
 #include <list>
 
Index: pcl-1.7.2/octree/include/pcl/octree/boost.h
===================================================================
--- pcl-1.7.2.orig/octree/include/pcl/octree/boost.h
+++ pcl-1.7.2/octree/include/pcl/octree/boost.h
@@ -45,6 +45,10 @@
 #endif
 
 // Marking all Boost headers as system headers to remove warnings
+#ifndef Q_MOC_RUN
 #include <boost/graph/adjacency_list.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/function.hpp>
+#endif
 #endif    // PCL_OCTREE_BOOST_H_
Index: pcl-1.7.2/geometry/include/pcl/geometry/boost.h
===================================================================
--- pcl-1.7.2.orig/geometry/include/pcl/geometry/boost.h
+++ pcl-1.7.2/geometry/include/pcl/geometry/boost.h
@@ -45,11 +45,23 @@
 #  pragma GCC system_header
 #endif
 
+#ifndef Q_MOC_RUN
 #include <boost/concept_check.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/operators.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/type_traits/integral_constant.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/type_traits/is_same.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/version.hpp>
+#endif
 
 #endif // PCL_GEOMETRY_BOOST_H
Index: pcl-1.7.2/test/boost.h
===================================================================
--- pcl-1.7.2.orig/test/boost.h
+++ pcl-1.7.2/test/boost.h
@@ -46,12 +46,26 @@
 #endif
 
 // Marking all Boost headers as system headers to remove warnings
+#ifndef Q_MOC_RUN
 #include <boost/random.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/thread.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/smart_ptr/shared_array.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/random/mersenne_twister.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/random/uniform_int.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/random/uniform_real.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/random/variate_generator.hpp>
+#endif
 
 #endif    // PCL_TEST_BOOST_H_
Index: pcl-1.7.2/test/common/boost.h
===================================================================
--- pcl-1.7.2.orig/test/common/boost.h
+++ pcl-1.7.2/test/common/boost.h
@@ -46,7 +46,11 @@
 #endif
 
 // Marking all Boost headers as system headers to remove warnings
+#ifndef Q_MOC_RUN
 #include <boost/random.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/random/variate_generator.hpp>
+#endif
 
 #endif    // PCL_TEST_COMMON_BOOST_H_
Index: pcl-1.7.2/kdtree/include/pcl/kdtree/kdtree_flann.h
===================================================================
--- pcl-1.7.2.orig/kdtree/include/pcl/kdtree/kdtree_flann.h
+++ pcl-1.7.2/kdtree/include/pcl/kdtree/kdtree_flann.h
@@ -44,7 +44,9 @@
 #include <pcl/kdtree/kdtree.h>
 #include <pcl/kdtree/flann.h>
 
+#ifndef Q_MOC_RUN
 #include <boost/shared_array.hpp>
+#endif
 
 // Forward declarations
 namespace flann
Index: pcl-1.7.2/surface/include/pcl/surface/boost.h
===================================================================
--- pcl-1.7.2.orig/surface/include/pcl/surface/boost.h
+++ pcl-1.7.2/surface/include/pcl/surface/boost.h
@@ -44,11 +44,23 @@
 #  pragma GCC system_header 
 #endif
 
+#ifndef Q_MOC_RUN
 #include <boost/bind.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/function.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/random.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/unordered_map.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/dynamic_bitset/dynamic_bitset.hpp>
+#endif
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
 
 #endif    // PCL_SURFACE_BOOST_H_
Index: pcl-1.7.2/apps/include/pcl/apps/openni_passthrough.h
===================================================================
--- pcl-1.7.2.orig/apps/include/pcl/apps/openni_passthrough.h
+++ pcl-1.7.2/apps/include/pcl/apps/openni_passthrough.h
@@ -39,6 +39,7 @@
 #define PCL_APPS_OPENNI_PASSTHROUGH_3D_
 
 // PCL
+#ifndef Q_MOC_RUN
 #include <pcl/apps/openni_passthrough_qt.h>
 #include <pcl/point_cloud.h>
 #include <pcl/point_types.h>
@@ -46,6 +47,7 @@
 #include <pcl/common/time.h>
 #include <pcl/visualization/pcl_visualizer.h>
 #include <pcl/filters/passthrough.h>
+#endif
 
 // Useful macros
 #define FPS_CALC(_WHAT_) \

--- End Message ---

--- Begin Message ---
This has been done in 1.7.2-10, but accidentally not closed.
signature.asc
Description: Digital signature

--- End Message ---

-- 
debian-science-maintainers mailing list
debian-science-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers

Bug#795525: marked as done (pcl: FTBFS with gcc5)

Reply via email to