Merge pull request #152 from dakcarto/patch-1

Add libqico.dylib copy and lib update to Mac app bundle for upcoming 1.8...
qgis · May 28, 2012 · 9f5f35a · 9f5f35a
2 parents 369b32e + 721765e
commit 9f5f35a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mac/cmake/1qt.cmake.in b/mac/cmake/1qt.cmake.in
@@ -59,7 +59,7 @@ ENDFOREACH (QFW)
 # Qt plugins
 
 EXECUTE_PROCESS (COMMAND mkdir -p "${QPLUGDIR}/../imageformats")
-FOREACH (QI qgif;qjpeg;qsvg;qtiff)
+FOREACH (QI qgif;qico;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 ()
@@ -177,7 +177,7 @@ FOREACH (QFW ${QTLISTQG})
     IF (@OSX_HAVE_LOADERPATH@)
         SET (QFW_CHG_TO "${ATLOADER}/@QGIS_PLUGIN_SUBDIR_REV@/${QGIS_FW_SUBDIR}/${LIBPOST}")
     ENDIF ()
-    FOREACH (QI qgif;qjpeg;qsvg;qtiff)
+    FOREACH (QI qgif;qico;qjpeg;qsvg;qtiff)
         INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QPLUGDIR}/../imageformats/lib${QI}.dylib")
     ENDFOREACH (QI)
     FOREACH (QC cn;jp;kr;tw)