bundle sip to correct dir

qgis · Oct 25, 2018 · 6526dd0 · 6526dd0
1 parent 25c94d4
commit 6526dd0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/mac/cmake/1qt.cmake.in b/mac/cmake/1qt.cmake.in
@@ -279,7 +279,11 @@ PYTHONMODULEDIR("sip.so" SIPMODDIR)
 IF (SIPMODDIR)
     IF (NOT EXISTS "${QGISPYDIR}/sip.so")
         # MYMESSAGE ("ditto ${QARCHS} \"${SIPMODDIR}/sip.so\" \"${QGISPYDIR}/\"")
-        EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${SIPMODDIR}/sip.so" "${QGISPYDIR}/")
+        IF (${SIPMODDIR} MATCHES ".*PyQt5.*")
+            EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${SIPMODDIR}/sip.so" "${QGISPYDIR}/PyQt5/")
+        ELSE ()
+            EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${SIPMODDIR}/sip.so" "${QGISPYDIR}/")
+        ENDIF ()
         EXECUTE_PROCESS (COMMAND cp -fp "${SIPMODDIR}/sipconfig.py" "${QGISPYDIR}/")
     ENDIF ()
 ELSE ()