Skip to content

Commit

Permalink
Fix bundle-relative linking for libqscintilla2.dylib (now required li…
Browse files Browse the repository at this point in the history
…b) on Mac
  • Loading branch information
dakcarto committed Jul 17, 2014
1 parent c05e5e2 commit 025741f
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions mac/cmake/1qt.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,12 @@ ENDIF (ISLIB)
# QScintilla2

IF (@QSCINTILLA_LIBRARY@ MATCHES ".*libqscintilla2.dylib")
MESSAGE (STATUS "Copying QScintilla2 library...")
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QSCINTILLA_LIBRARY@" "${QLIBDIR}/libqscintilla2.dylib")
# nothing to update in QGIS
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)
IF (QSCI_CHG)
UPDATEQGISPATHS (${QSCI_CHG} libqscintilla2.dylib)
ENDIF (QSCI_CHG)
ENDIF ()

# PyQt
Expand Down

0 comments on commit 025741f

Please sign in to comment.