Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build fixes for scripting support on mac.

Browse Source
This commit is contained in:
John Maguire 2011-01-18 12:47:26 +00:00
parent abb93cd020
commit 33ad8249b0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/SipBindings.cmake
View File

@ -1,7 +1,11 @@
find_path(PYQT_SIP_DIR Qt/Qtmod.sip find_path(PYQT_SIP_DIR Qt/Qtmod.sip
PATHS /System/Library/Frameworks/Python.framework/Versions/2.6
PATH_SUFFIXES share/sip/PyQt4 PATH_SUFFIXES share/sip/PyQt4
) )
find_program(SIP_BINARY "sip"
PATHS /System/Library/Frameworks/Python.framework/Versions/2.6/bin)
macro(add_sip_binding outputvar source) macro(add_sip_binding outputvar source)
# Work out what the SIP flags should be for PyQt4. These would normally be # 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 # obtained from PyQt4.pyqtconfig.Configuration().pyqt_sip_flags, but we can't
@ -9,13 +13,13 @@ macro(add_sip_binding outputvar source)
set(PYQT_SIP_FLAGS set(PYQT_SIP_FLAGS
"-x" "VendorID" "-x" "VendorID"
"-x" "PyQt_NoPrintRangeBug" "-x" "PyQt_NoPrintRangeBug"
"-t" "Qt_4_6_2" "-t" "Qt_4_7_1"
) )
if(WIN32) if(WIN32)
list(APPEND PYQT_SIP_FLAGS "-t" "WS_WIN") list(APPEND PYQT_SIP_FLAGS "-t" "WS_WIN")
elseif(APPLE) elseif(APPLE)
list(APPEND PYQT_SIP_FLAGS "-t" "WS_MAC") list(APPEND PYQT_SIP_FLAGS "-t" "WS_MACX")
else(WIN32) else(WIN32)
list(APPEND PYQT_SIP_FLAGS "-t" "WS_X11") list(APPEND PYQT_SIP_FLAGS "-t" "WS_X11")
endif(WIN32) endif(WIN32)
@ -51,7 +55,7 @@ macro(add_sip_binding outputvar source)
add_custom_command( add_custom_command(
OUTPUT ${outputs} OUTPUT ${outputs}
COMMAND "sip" ${PYQT_SIP_FLAGS} COMMAND ${SIP_BINARY} ${PYQT_SIP_FLAGS}
"-I${PYQT_SIP_DIR}" "-I${PYQT_SIP_DIR}"
"-c" "${CMAKE_CURRENT_BINARY_DIR}" "-c" "${CMAKE_CURRENT_BINARY_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}/${source}" "${CMAKE_CURRENT_SOURCE_DIR}/${source}"