bundle osgEarthQt if available

qgis · Apr 4, 2013 · f832a34 · f832a34
1 parent 9f42294
commit f832a34
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/mac/CMakeLists.txt b/mac/CMakeLists.txt
@@ -8,10 +8,10 @@ IF (APPLE)
   INSTALL (SCRIPT ${CMAKE_BINARY_DIR}/mac/0qgis.cmake)
   IF (QGIS_MACAPP_BUNDLE GREATER 0)
     # start with Qt
-    CONFIGURE_FILE (cmake/1qt.cmake.in 1qt.cmake @ONLY)
-    INSTALL (SCRIPT ${CMAKE_BINARY_DIR}/mac/1qt.cmake)
     CONFIGURE_FILE (cmake/1osg.cmake.in 1osg.cmake @ONLY)
     INSTALL (SCRIPT ${CMAKE_BINARY_DIR}/mac/1osg.cmake)
+    CONFIGURE_FILE (cmake/1qt.cmake.in 1qt.cmake @ONLY)
+    INSTALL (SCRIPT ${CMAKE_BINARY_DIR}/mac/1qt.cmake)
     IF (QGIS_MACAPP_BUNDLE GREATER 1)
       # next - libs
       CONFIGURE_FILE (cmake/2lib.cmake.in 2lib.cmake @ONLY)

diff --git a/mac/cmake/1osg.cmake.in b/mac/cmake/1osg.cmake.in
@@ -16,6 +16,9 @@ SET (OSG_PLUGINS_PATH "@OSG_PLUGINS_PATH@")
 # list of osg frameworks to bundle
 
 SET (OSGLIST OpenThreads osg osgDB osgGA osgViewer osgEarth osgEarthAnnotation osgEarthFeatures osgEarthSymbology osgEarthUtil osgFX osgManipulator osgShadow osgSim osgTerrain osgText osgUtil osgWidget)
+IF (@HAVE_OSGEARTHQT@)
+    SET (OSGLIST ${OSGLIST} osgQt osgEarthQt)
+ENDIF (@HAVE_OSGEARTHQT@)
 #SET (PYOSGLIST future python bindings?)
 MYMESSAGE ("OSG list: ${OSGLIST}")
 
@@ -75,5 +78,9 @@ FOREACH (OFW ${OSGLIST})
     # globe plugin
     INSTALLNAMETOOL_CHANGE ("${OFW_CHG}" "${OFW_CHG_TO}" "${QPLUGDIR}/libglobeplugin.so")
 ENDFOREACH (OFW)
+IF (@HAVE_OSGEARTHQT@)
+
+    SET (OSGLIST ${OSGLIST} osgQt osgEarthQt)
+ENDIF (@HAVE_OSGEARTHQT@)
 
 ENDIF (@OSGEARTH_FOUND@)
diff --git a/mac/cmake/1qt.cmake.in b/mac/cmake/1qt.cmake.in
@@ -262,6 +262,15 @@ FOREACH (QFW ${QTLISTQG})
         ENDIF ()
         INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QFWDIR}/qwt.framework/qwt")
     ENDIF (ISLIB)
+    # osgEarthQt
+    IF (@HAVE_OSGEARTHQT@)
+        IF (@OSX_HAVE_LOADERPATH@)
+            SET (QFW_CHG_TO "${ATLOADER}/../../../${LIBPOST}")
+        ENDIF ()
+        FOREACH (OSGFW osgQt osgEarthQt)
+            INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QFWDIR}/${OSGFW}.framework/${OSGFW}")
+        ENDFOREACH (OSGFW)
+    ENDIF (@HAVE_OSGEARTHQT@)
     # QScintilla2
     IF (@OSX_HAVE_LOADERPATH@)
         SET (QFW_CHG_TO "${ATLOADER}/${QGIS_LIB_SUBDIR_REV}/${QGIS_FW_SUBDIR}/${LIBPOST}")