From 16b546692224f65e8f8aae5df4fbe5b73ae3c47b Mon Sep 17 00:00:00 2001 From: John Maguire Date: Thu, 27 Jan 2011 15:40:53 +0000 Subject: [PATCH] Nicer platform specific sip flags. --- cmake/SipBindings.cmake | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/cmake/SipBindings.cmake b/cmake/SipBindings.cmake index 7ab86f17f..a5534241a 100644 --- a/cmake/SipBindings.cmake +++ b/cmake/SipBindings.cmake @@ -10,25 +10,19 @@ macro(add_sip_binding outputvar source) # Work out what the SIP flags should be for PyQt4. These would normally be # obtained from PyQt4.pyqtconfig.Configuration().pyqt_sip_flags, but we can't # call that when cross-compiling. - if (APPLE) - set(PYQT_SIP_FLAGS - "-x" "VendorID" - "-x" "PyQt_NoPrintRangeBug" - "-t" "Qt_4_7_1" - ) - else (APPLE) - set(PYQT_SIP_FLAGS - "-x" "VendorID" - "-x" "PyQt_NoPrintRangeBug" - "-t" "Qt_4_6_2" - ) - endif (APPLE) + set(PYQT_SIP_FLAGS + "-x" "VendorID" + "-x" "PyQt_NoPrintRangeBug" + ) if(WIN32) + list(APPEND PYQT_SIP_FLAGS "-t" "Qt_4_6_2") list(APPEND PYQT_SIP_FLAGS "-t" "WS_WIN") elseif(APPLE) + list(APPEND PYQT_SIP_FLAGS "-t" "Qt_4_7_1") list(APPEND PYQT_SIP_FLAGS "-t" "WS_MACX") else(WIN32) + list(APPEND PYQT_SIP_FLAGS "-t" "Qt_4_6_2") list(APPEND PYQT_SIP_FLAGS "-t" "WS_X11") endif(WIN32)