2013-02-09 20:03:18 +00:00
|
|
|
diff -urN a/CMakeLists.txt b/CMakeLists.txt
|
2014-08-21 13:15:05 +00:00
|
|
|
--- a/CMakeLists.txt 2014-08-14 14:17:11.000000000 -0600
|
|
|
|
|
+++ b/CMakeLists.txt 2014-08-21 07:12:45.079779571 -0600
|
|
|
|
|
@@ -101,12 +101,14 @@
|
2013-02-09 20:03:18 +00:00
|
|
|
|
2014-08-21 13:15:05 +00:00
|
|
|
set(SIP_INCLUDES ${CMAKE_BINARY_DIR} ${PYQT4_SIP_DIR} sip)
|
|
|
|
|
set(SIP_CONCAT_PARTS 8)
|
2013-02-09 20:03:18 +00:00
|
|
|
+# Pull in ARM configuration options if needed
|
|
|
|
|
+STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "")
|
|
|
|
|
if (WIN32)
|
2014-08-21 13:15:05 +00:00
|
|
|
set(SIP_TAGS ALL WS_WIN ${PYQT4_VERSION_TAG})
|
2013-02-09 20:03:18 +00:00
|
|
|
else ()
|
|
|
|
|
set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
|
|
|
|
|
endif ()
|
|
|
|
|
-set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
|
|
|
|
|
+set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
|
|
|
|
|
|
2014-08-21 13:15:05 +00:00
|
|
|
set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)
|
|
|
|
|
|
