Qscintilla library may have _qt5 in name

qgis · Mar 3, 2020 · ec71254 · ec71254
1 parent 919088c
commit ec71254
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/mac/cmake/1qt.cmake.in b/mac/cmake/1qt.cmake.in
@@ -252,12 +252,17 @@ ENDIF ()
 
 # QScintilla2
 
-IF (@QSCINTILLA_LIBRARY@ MATCHES ".*libqscintilla2.dylib")
+IF (@QSCINTILLA_LIBRARY@ MATCHES ".*libqscintilla2_qt5.*dylib")
+    SET (QSCI_LIB "libqscintilla2_qt5")
+ELSEIF (@QSCINTILLA_LIBRARY@ MATCHES ".*libqscintilla2.*dylib")
+    SET (QSCI_LIB "libqscintilla2")
+ENDIF ()
+IF (QSCI_LIB)
     MESSAGE (STATUS "Copying QScintilla2 library and updating library paths...")
-    EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QSCINTILLA_LIBRARY@" "${QLIBDIR}/libqscintilla2.dylib")
-    GET_INSTALL_NAME ("@QSCINTILLA_LIBRARY@" "libqscintilla2" QSCI_CHG)
+    EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QSCINTILLA_LIBRARY@" "${QLIBDIR}/${QSCI_LIB}.dylib")
+    GET_INSTALL_NAME ("@QSCINTILLA_LIBRARY@" "${QSCI_LIB}" QSCI_CHG)
     IF (QSCI_CHG)
-        UPDATEQGISPATHS (${QSCI_CHG} libqscintilla2.dylib)
+        UPDATEQGISPATHS (${QSCI_CHG} ${QSCI_LIB}.dylib)
     ENDIF (QSCI_CHG)
 ENDIF ()
 
@@ -372,11 +377,11 @@ ENDIF ()
 
 IF (EXISTS "${QGISPYDIR}/PyQt${QT_FWVER}/Qsci.so")
     MESSAGE (STATUS "Updating QScintilla2 Python module library paths...")
-	GET_INSTALL_NAME ("${QGISPYDIR}/PyQt${QT_FWVER}/Qsci.so" "libqscintilla2" QSCI_CHG)
+	GET_INSTALL_NAME ("${QGISPYDIR}/PyQt${QT_FWVER}/Qsci.so" "${QSCI_LIB}" QSCI_CHG)
     IF (QSCI_CHG)
-        SET (QSCI_CHG_TO "${ATEXECUTABLE}/@QGIS_LIB_SUBDIR@/libqscintilla2.dylib")
+        SET (QSCI_CHG_TO "${ATEXECUTABLE}/@QGIS_LIB_SUBDIR@/${QSCI_LIB}.dylib")
         IF (@OSX_HAVE_LOADERPATH@)
-            SET (QSCI_CHG_TO "${ATLOADER}/../../@QGIS_DATA_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/libqscintilla2.dylib")
+            SET (QSCI_CHG_TO "${ATLOADER}/../../@QGIS_DATA_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${QSCI_LIB}.dylib")
         ENDIF (@OSX_HAVE_LOADERPATH@)
         INSTALLNAMETOOL_CHANGE ("${QSCI_CHG}" "${QSCI_CHG_TO}" "${QGISPYDIR}/PyQt${QT_FWVER}/Qsci.so")
     ENDIF (QSCI_CHG)
@@ -470,7 +475,7 @@ FOREACH (QFW ${QTLISTQG})
     IF (@OSX_HAVE_LOADERPATH@)
         SET (QFW_CHG_TO "${ATLOADER}/${QGIS_LIB_SUBDIR_REV}/${QGIS_FW_SUBDIR}/${LIBPOST}")
     ENDIF ()
-    INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QLIBDIR}/libqscintilla2.dylib")
+    INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QLIBDIR}/${QSCI_LIB}.dylib")
     # qt plugs
     IF (@OSX_HAVE_LOADERPATH@)
         SET (QFW_CHG_TO "${ATLOADER}/@QGIS_PLUGIN_SUBDIR_REV@/${QGIS_FW_SUBDIR}/${LIBPOST}")