View | Details | Raw Unified | Return to bug 217425 | Differences between
and this patch

Collapse All | Expand All

(-)files/patch-CMakeLists.txt (+21 lines)
Line 0 Link Here
1
--- CMakeLists.txt.orig	2014-08-14 22:17:11 UTC
2
+++ CMakeLists.txt
3
@@ -99,6 +99,9 @@ include_directories(
4
     ${KDEPIMLIBS_INCLUDE_DIRS}
5
 )
6
 
7
+# Pull in ARM configuration options if needed
8
+STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "")
9
+
10
 set(SIP_INCLUDES ${CMAKE_BINARY_DIR} ${PYQT4_SIP_DIR} sip)
11
 set(SIP_CONCAT_PARTS 8)
12
 if (WIN32)
13
@@ -106,7 +109,7 @@ if (WIN32)
14
 else ()
15
     set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
16
 endif ()
17
-set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
18
+set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
19
 
20
 set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)
21
 

Return to bug 217425