mirror of https://git.wownero.com/dsc/mxe.git
package cgal: fix build failure when qt is present
When Qt happened to be present, CGAL would fail to build. This happened when moc was called on certain files that included has_binary_operator.hpp from boost: <includedir>/boost/type_traits/detail/has_binary_operator.hp:50: Parse error at "BOOST_JOIN"
This commit is contained in:
parent
3991490b57
commit
8035a88938
|
@ -6,7 +6,7 @@ Contains ad hoc patches for cross building.
|
|||
From 89e55b180994db937e019678a2abccd0c6f73f7e Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Fri, 21 Oct 2011 23:08:52 +0200
|
||||
Subject: [PATCH] adjustments for mingw-cross-env
|
||||
Subject: [PATCH 1/2] adjustments for mingw-cross-env
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
|
@ -212,5 +212,43 @@ index f1a7201..23a53c9 100644
|
|||
|
||||
if (os == ON_ORIENTED_BOUNDARY && is_infinite(fh)) {
|
||||
--
|
||||
1.7.7
|
||||
1.7.7.3
|
||||
|
||||
|
||||
From 5a7fc183023450d520993a36402a8783d709b683 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Fri, 18 Nov 2011 00:08:25 +0100
|
||||
Subject: [PATCH 2/2] prevent Qt's moc from choking on BOOST_JOIN
|
||||
|
||||
|
||||
diff --git a/include/CGAL/Qt/GraphicsItem.h b/include/CGAL/Qt/GraphicsItem.h
|
||||
index 7348d02..807e200 100644
|
||||
--- a/include/CGAL/Qt/GraphicsItem.h
|
||||
+++ b/include/CGAL/Qt/GraphicsItem.h
|
||||
@@ -24,7 +24,9 @@
|
||||
#include <CGAL/auto_link/Qt4.h>
|
||||
#include <QObject>
|
||||
#include <QGraphicsItem>
|
||||
+#ifndef Q_MOC_RUN
|
||||
#include <CGAL/Object.h>
|
||||
+#endif
|
||||
|
||||
|
||||
|
||||
diff --git a/include/CGAL/Qt/GraphicsViewInput.h b/include/CGAL/Qt/GraphicsViewInput.h
|
||||
index 6c912cc..a5c5da8 100644
|
||||
--- a/include/CGAL/Qt/GraphicsViewInput.h
|
||||
+++ b/include/CGAL/Qt/GraphicsViewInput.h
|
||||
@@ -22,7 +22,9 @@
|
||||
#define CGAL_QT_GRAPHICS_VIEW_INPUT_H
|
||||
|
||||
#include <CGAL/auto_link/Qt4.h>
|
||||
+#ifndef Q_MOC_RUN
|
||||
#include <CGAL/Object.h>
|
||||
+#endif
|
||||
#include <QObject>
|
||||
|
||||
namespace CGAL {
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ $(PKG)_SUBDIR := CGAL-$($(PKG)_VERSION)
|
|||
$(PKG)_FILE := CGAL-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_WEBSITE := http://www.cgal.org/
|
||||
$(PKG)_URL := https://gforge.inria.fr/frs/download.php/28500/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc boost gmp mpfr
|
||||
$(PKG)_DEPS := gcc boost gmp mpfr qt
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
wget -q -O- 'https://gforge.inria.fr/frs/?group_id=52' | \
|
||||
|
|
Loading…
Reference in New Issue