Skip to content

Commit 3d44c59

Browse files
committed
Disable features on ARM.
Building QGIS on ARM produces the error: sip: qgis/python/core/qgsclipper.sip:44: \ QgsClipper::trimFeature() unsupported function argument type - provide %MethodCode and a C++ signature For the Android builds this was fixed in commit 2cc6847. This patch adapts the Android fix, by disabling the SIP features on all ARM systems. Bug-Debian: http://bugs.debian.org/737814
1 parent 7db6ae5 commit 3d44c59

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

python/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ IF(NOT ANDROID)
5555
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} ANDROID)
5656
ENDIF(NOT ANDROID)
5757

58+
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
59+
ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
60+
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} ARM)
61+
ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
62+
5863
IF(NOT WITH_TOUCH)
5964
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_TOUCH)
6065
ENDIF(NOT WITH_TOUCH)

python/core/composer/qgscomposerscalebar.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class QgsComposerScaleBar: QgsComposerItem
109109
of the segment
110110
@note python bindings not available on android
111111
*/
112-
%If (!ANDROID)
112+
%If (!ARM)
113113
void segmentPositions( QList<QPair<double, double> >& posWidthList ) const;
114114
%End
115115

python/core/qgsclipper.sip

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
%Feature ARM
2+
13
class QgsClipper
24
{
35
%TypeHeaderCode
@@ -34,7 +36,7 @@ class QgsClipper
3436
// A handy way to refer to the four boundaries
3537
enum Boundary {XMax, XMin, YMax, YMin};
3638

37-
%If (!ANDROID)
39+
%If (!ARM)
3840
// Trims the given feature to a rectangular box. Returns the trimmed
3941
// feature in x and y. The shapeOpen parameter determines whether
4042
// the function treats the points as a closed shape (polygon), or as

0 commit comments

Comments
 (0)