Ticket #47125: make_pykde4_respect_sip_flags.diff

File make_pykde4_respect_sip_flags.diff, 986 bytes (added by RJVB (René Bertin), 11 years ago)

  • CMakeLists.txt 

    From: Michael Casadevall <mcasadevall@debian.org>
Subject: Respect Qt SIP flags
Forwarded: no
Origin:
Last-Update: 2009-04-15

Corrects FTBFS on armel by making sure pykde4 properly parses the python-qt4
flags passed from PythonQt4's cmake file.
    old new include_directories( 
    101101    ${KDEPIMLIBS_INCLUDE_DIRS}
    102102)
    103103
     104# Pull in ARM configuration options if needed
     105STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "")
     106
    104107set(SIP_INCLUDES ${CMAKE_BINARY_DIR} ${PYQT4_SIP_DIR} sip)
    105108set(SIP_CONCAT_PARTS 8)
    106109if (WIN32)
    … … if (WIN32) 
    108111else ()
    109112    set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
    110113endif ()
    111 set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
     114set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
    112115
    113116set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)
    114117