Fix bundle-relative linking for libqscintilla2.dylib (now required li…

…b) on Mac
qgis · Jul 17, 2014 · 025741f · 025741f
1 parent c05e5e2
commit 025741f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/mac/cmake/1qt.cmake.in b/mac/cmake/1qt.cmake.in
@@ -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