From a04bc860dfac22eb07afa0ff735e69302a8c6bc8 Mon Sep 17 00:00:00 2001 From: William Kyngesburye Date: Mon, 9 Mar 2020 18:12:00 -0500 Subject: [PATCH] also check for private PyQt5/sip in Mac bundling --- mac/cmake/1qt.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mac/cmake/1qt.cmake.in b/mac/cmake/1qt.cmake.in index 2dac1ac47cb..678d6714a42 100644 --- a/mac/cmake/1qt.cmake.in +++ b/mac/cmake/1qt.cmake.in @@ -290,7 +290,7 @@ ENDFOREACH (PYPATH) MESSAGE (STATUS "Copying sip...") PYTHONMODULEDIR("sip.so" SIPMODDIR) IF (SIPMODDIR) - IF (NOT EXISTS "${QGISPYDIR}/sip.so") + IF (NOT EXISTS "${QGISPYDIR}/sip.so" AND NOT EXISTS "${QGISPYDIR}/PyQt5/sip.so") # MYMESSAGE ("ditto ${QARCHS} \"${SIPMODDIR}/sip.so\" \"${QGISPYDIR}/\"") IF (${SIPMODDIR} MATCHES ".*PyQt5.*") EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${SIPMODDIR}/sip.so" "${QGISPYDIR}/PyQt5/")