bundle qsqlite for eVis plugin; bundle other Qt frameworks for extra …

…plugins
qgis · Nov 6, 2011 · 38bc579 · 38bc579
1 parent 2d37a49
commit 38bc579
Showing 1 changed file with 8 additions and 30 deletions.
diff --git a/mac/cmake/1qt.cmake.in b/mac/cmake/1qt.cmake.in
@@ -27,41 +27,19 @@ INCLUDE (@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake)
 
 # build list of Qt frameworks to bundle
 
-SET (QTLISTQG QtCore QtGui phonon)
-SET (PYQTLIST Qt QtCore QtGui phonon)
-IF (@QT_USE_QTXML@)
-    SET (QTLISTQG ${QTLISTQG} QtXml)
-    SET (PYQTLIST ${PYQTLIST} QtXml)
-ENDIF (@QT_USE_QTXML@)
-IF (@QT_USE_QTNETWORK@)
-    SET (QTLISTQG ${QTLISTQG} QtNetwork)
-    SET (PYQTLIST ${PYQTLIST} QtNetwork)
-ENDIF (@QT_USE_QTNETWORK@)
-IF (@QT_USE_QTSVG@)
-    SET (QTLISTQG ${QTLISTQG} QtSvg)
-    SET (PYQTLIST ${PYQTLIST} QtSvg)
-ENDIF (@QT_USE_QTSVG@)
-IF (@QT_USE_QTSQL@)
-    SET (QTLISTQG ${QTLISTQG} QtSql)
-    SET (PYQTLIST ${PYQTLIST} QtSql)
-ENDIF (@QT_USE_QTSQL@)
-IF (@QT_USE_QTWEBKIT@)
-    SET (QTLISTQG ${QTLISTQG} QtWebKit)
-    SET (PYQTLIST ${PYQTLIST} QtWebKit)
-    # see if it links QtDBus
+# core list, includes dependencies
+SET (QTLISTQG QtCore QtGui phonon QtXml QtNetwork QtSvg QtSql QtWebKit QtXmlPatterns)
+SET (PYQTLIST Qt QtCore QtGui phonon QtXml QtNetwork QtSvg QtSql QtWebKit QtXmlPatterns)
+# see if QtWebKit links QtDBus
     EXECUTE_PROCESS (COMMAND otool -L @QT_QTWEBKIT_LIBRARY@/QtWebKit
                      OUTPUT_VARIABLE QTWEBKIT_DBUS)
     IF (QTWEBKIT_DBUS MATCHES ".*QtDBus.framework.*")
         SET (QTLISTQG ${QTLISTQG} QtDBus)
     ENDIF ()
-    # see if it links QtXmlPatterns
-    EXECUTE_PROCESS (COMMAND otool -L @QT_QTWEBKIT_LIBRARY@/QtWebKit
-                     OUTPUT_VARIABLE QTWEBKIT_XMLP)
-    IF (QTWEBKIT_XMLP MATCHES ".*QtXmlPatterns.framework.*")
-        SET (QTLISTQG ${QTLISTQG} QtXmlPatterns)
-        SET (PYQTLIST ${PYQTLIST} QtXmlPatterns)
-    ENDIF ()
-ENDIF (@QT_USE_QTWEBKIT@)
+# additional Qt may be needed by plugins
+SET (QTLISTQG ${QTLISTQG} QtMultimedia QtOpenGL)
+SET (PYQTLIST ${PYQTLIST} QtMultimedia QtOpenGL)
+
 MYMESSAGE ("Qt list: ${QTLISTQG}")
 
 # qt arches