sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove PyQt4 leftovers in mac cmake config

Browse Source
This commit is contained in:
Denis Rouzaud 2018-02-05 21:19:16 -04:00
parent d1c6941ae4
commit 33ca8fcb69
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mac/cmake/0vars.cmake.in
View File

@ -57,8 +57,8 @@ SET (ENABLE_TESTS "@ENABLE_TESTS@")
SET (PYTHON_MODULE_PATHS)
STRING(REPLACE ":" ";" _pythonpath "$ENV{PYTHONPATH}")
LIST(APPEND PYTHON_MODULE_PATHS ${_pythonpath})
IF (EXISTS "@PYQT4_MOD_DIR@")
LIST(APPEND PYTHON_MODULE_PATHS "@PYQT4_MOD_DIR@")
IF (EXISTS "@PYQT5_MOD_DIR@")
LIST(APPEND PYTHON_MODULE_PATHS "@PYQT5_MOD_DIR@")
ENDIF ()
IF (EXISTS "@SIP_MOD_DIR@")
LIST(APPEND PYTHON_MODULE_PATHS "@SIP_MOD_DIR@")

10
mac/cmake/1qt.cmake.in
View File

@ -263,13 +263,13 @@ FOREACH (PQ ${PYQTLIST})
PYTHONMODULEDIR("${MODSUBPATH}" MODDIR)
IF (MODDIR)
IF (NOT EXISTS "${QGISPYDIR}/${MODSUBPATH}")
# MESSAGE (STATUS "ditto ${QARCHS} \"${PYQT4MOD}\" \"${QGISPYDIR}/${MODSUBPATH}\"")
# MESSAGE (STATUS "ditto ${QARCHS} \"${PYQT5MOD}\" \"${QGISPYDIR}/${MODSUBPATH}\"")
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${MODDIR}/${MODSUBPATH}" "${QGISPYDIR}/${MODSUBPATH}")
ENDIF ()
ELSE (MODDIR)
MESSAGE (STATUS " PyQt4 module ${MODNAME} not found")
MESSAGE (STATUS " PyQt5 module ${MODNAME} not found")
ENDIF (MODDIR)
UNSET(PYQT4MOD)
UNSET(PYQT5MOD)
ENDFOREACH (PQ)
PYTHONMODULEDIR("PyQt${QT_FWVER}" PYQTMODDIR)
FILE (GLOB PQPYLIST "${PYQTMODDIR}/PyQt${QT_FWVER}/*.py")
@ -282,11 +282,11 @@ EXECUTE_PROCESS (COMMAND cp -RfpL "${PYQTMODDIR}/PyQt${QT_FWVER}/uic" "${QGISPYD
FOREACH (PU pylupdate4;pyrcc4)
IF (NOT EXISTS "${QBINDIR}/${PU}")
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@PYQT4_BIN_DIR@/${PU}" "${QBINDIR}/")
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@PYQT5_BIN_DIR@/${PU}" "${QBINDIR}/")
ENDIF ()
ENDFOREACH (PU)
IF (NOT EXISTS "${QBINDIR}/pyuic4")
EXECUTE_PROCESS (COMMAND sed -E "s, /.*/PyQt4/uic/pyuic.py, \"\$(/usr/bin/dirname \"\$0\")/../../Resources/python/PyQt4/uic/pyuic.py\"," "@PYQT4_BIN_DIR@/pyuic4"
EXECUTE_PROCESS (COMMAND sed -E "s, /.*/PyQt5/uic/pyuic.py, \"\$(/usr/bin/dirname \"\$0\")/../../Resources/python/PyQt5/uic/pyuic.py\"," "@PYQT5_BIN_DIR@/pyuic4"
OUTPUT_VARIABLE PYUIC_CONTENTS)
FILE (WRITE "${QBINDIR}/pyuic4" "${PYUIC_CONTENTS}")
EXECUTE_PROCESS (COMMAND chmod +x "${QBINDIR}/pyuic4")