bundle more Qt imageformats that might be useful to external plugins

qgis · May 3, 2012 · 98f5bd4 · 98f5bd4
1 parent 6229eec
commit 98f5bd4
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/mac/cmake/1qt.cmake.in b/mac/cmake/1qt.cmake.in
@@ -59,9 +59,11 @@ ENDFOREACH (QFW)
 # Qt plugins
 
 EXECUTE_PROCESS (COMMAND mkdir -p "${QPLUGDIR}/../imageformats")
-IF (NOT EXISTS "${QPLUGDIR}/../imageformats/libqjpeg.dylib")
-    EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QT_PLUGINS_DIR@/imageformats/libqjpeg.dylib" "${QPLUGDIR}/../imageformats/libqjpeg.dylib")
-ENDIF ()
+FOREACH (QI qgif;qjpeg;qsvg;qtiff)
+    IF (NOT EXISTS "${QPLUGDIR}/../imageformats/lib${QI}.dylib")
+        EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QT_PLUGINS_DIR@/imageformats/lib${QI}.dylib" "${QPLUGDIR}/../imageformats/lib${QI}.dylib")
+    ENDIF ()
+ENDFOREACH (QI)
 EXECUTE_PROCESS (COMMAND mkdir -p "${QPLUGDIR}/../codecs")
 FOREACH (QTC cn;jp;kr;tw)
     IF (NOT EXISTS "${QPLUGDIR}/../codecs/libq${QTC}codecs.dylib")
@@ -175,7 +177,9 @@ FOREACH (QFW ${QTLISTQG})
     IF (@OSX_HAVE_LOADERPATH@)
         SET (QFW_CHG_TO "${ATLOADER}/@QGIS_PLUGIN_SUBDIR_REV@/${QGIS_FW_SUBDIR}/${LIBPOST}")
     ENDIF ()
-    INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QPLUGDIR}/../imageformats/libqjpeg.dylib")
+    FOREACH (QI qgif;qjpeg;qsvg;qtiff)
+        INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QPLUGDIR}/../imageformats/lib${QI}.dylib")
+    ENDFOREACH (QI)
     FOREACH (QC cn;jp;kr;tw)
         INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QPLUGDIR}/../codecs/libq${QC}codecs.dylib")
     ENDFOREACH (QC)