remove PyQt4 leftovers in mac cmake config

qgis · Feb 6, 2018 · 33ca8fc · 33ca8fc
1 parent d1c6941
commit 33ca8fc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/mac/cmake/0vars.cmake.in b/mac/cmake/0vars.cmake.in
@@ -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@")

diff --git a/mac/cmake/1qt.cmake.in b/mac/cmake/1qt.cmake.in
@@ -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")