Skip to content

Commit 025741f

Browse files
committed
Fix bundle-relative linking for libqscintilla2.dylib (now required lib) on Mac
1 parent c05e5e2 commit 025741f

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

mac/cmake/1qt.cmake.in

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,12 @@ ENDIF (ISLIB)
120120
# QScintilla2
121121

122122
IF (@QSCINTILLA_LIBRARY@ MATCHES ".*libqscintilla2.dylib")
123-
MESSAGE (STATUS "Copying QScintilla2 library...")
124-
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QSCINTILLA_LIBRARY@" "${QLIBDIR}/libqscintilla2.dylib")
125-
# nothing to update in QGIS
123+
MESSAGE (STATUS "Copying QScintilla2 library and updating library paths...")
124+
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QSCINTILLA_LIBRARY@" "${QLIBDIR}/libqscintilla2.dylib")
125+
GET_INSTALL_NAME ("@QSCINTILLA_LIBRARY@" "libqscintilla2" QSCI_CHG)
126+
IF (QSCI_CHG)
127+
UPDATEQGISPATHS (${QSCI_CHG} libqscintilla2.dylib)
128+
ENDIF (QSCI_CHG)
126129
ENDIF ()
127130

128131
# PyQt

0 commit comments

Comments
 (0)