Define QGIS_MACAPP_BUNDLE in qgsconfig.h so resources can be found when QGIS_MACAPP_BUNDLE=0

dakcarto · dakcarto · commit 30fff8570395 · 2014-02-22T15:02:51.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -450,10 +450,6 @@ ELSE (WIN32)
     SET (CMAKE_INSTALL_NAME_DIR ${CMAKE_BINARY_DIR}/output/lib)
     IF (WITH_GLOBE)
       SET (OSG_PLUGINS_PATH "" CACHE PATH "Path to OSG plugins for bundling")
-      IF (QGIS_MACAPP_BUNDLE GREATER 0)
-        # ensure OSG plugins bundled path will be used by globe plugin
-        SET (HAVE_MACAPP_BUNDLED_OSG 1)
-      ENDIF (QGIS_MACAPP_BUNDLE GREATER 0)
     ENDIF (WITH_GLOBE)
     # recent cmakes force SDKs, recent SDKs don't have user symlinks
     # need to find non-system frameworks
diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
@@ -29,10 +29,13 @@
 #define CMAKE_SOURCE_DIR "${CMAKE_SOURCE_DIR}"
 
 #define QSCINTILLA_VERSION_STR "${QSCINTILLA_VERSION_STR}"
-//used by Mac to find system Qt plugins when bundle is run from build directory
-#define QTPLUGINSDIR "${QT_PLUGINS_DIR}"
 
-//used by Mac to find system Open Scene Graph plugins when bundle is run from build directory
+#if defined( __APPLE__ )
+//used by Mac to find system or bundle resources relative to amount of bundling
+#define QGIS_MACAPP_BUNDLE ${QGIS_MACAPP_BUNDLE}
+#endif
+
+#define QT_PLUGINS_DIR "${QT_PLUGINS_DIR}"
 #define OSG_PLUGINS_PATH "${OSG_PLUGINS_PATH}"
 
 #cmakedefine USING_NMAKE
@@ -53,7 +56,5 @@
 
 #cmakedefine MAPSERVER_SKIP_ECW
 
-#cmakedefine HAVE_MACAPP_BUNDLED_OSG
-
 #endif
 
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -858,9 +858,9 @@ int main( int argc, char *argv[] )
     // Now set the paths inside the bundle
     myPath += "/Contents/Plugins";
     QCoreApplication::addLibraryPath( myPath );
-    if ( QgsApplication::isRunningFromBuildDir() )
+    if ( QgsApplication::isRunningFromBuildDir() || QGIS_MACAPP_BUNDLE == 0 )
     {
-      QCoreApplication::addLibraryPath( QTPLUGINSDIR );
+      QCoreApplication::addLibraryPath( QT_PLUGINS_DIR );
     }
     //next two lines should not be needed, testing only
 #if 0
diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
@@ -111,13 +111,11 @@ GlobePlugin::GlobePlugin( QgisInterface* theQgisInterface )
   {
     // OSG_PLUGINS_PATH value set by CMake option
     QString ogsPlugins( OSG_PLUGINS_PATH );
-#ifdef HAVE_MACAPP_BUNDLED_OSG
-    if ( !QgsApplication::isRunningFromBuildDir() )
+    if ( QGIS_MACAPP_BUNDLE > 0 && !QgsApplication::isRunningFromBuildDir() )
     {
       // add internal osg plugin path if bundled osg
       ogsPlugins = QgsApplication::pluginPath() + "/../osgPlugins";
     }
-#endif
     if ( QFile::exists( ogsPlugins ) )
     {
       osgDB::Registry::instance()->setLibraryFilePathList( QDir::cleanPath( ogsPlugins ).toStdString() );

Original file line number	Diff line number	Diff line change
`@@ -858,9 +858,9 @@ int main( int argc, char *argv[] )`
`858`	`858`	`// Now set the paths inside the bundle`
`859`	`859`	`myPath += "/Contents/Plugins";`
`860`	`860`	`QCoreApplication::addLibraryPath( myPath );`
`861`		`- if ( QgsApplication::isRunningFromBuildDir() )`
	`861`	`+ if ( QgsApplication::isRunningFromBuildDir() \|\| QGIS_MACAPP_BUNDLE == 0 )`
`862`	`862`	`{`
`863`		`- QCoreApplication::addLibraryPath( QTPLUGINSDIR );`
	`863`	`+ QCoreApplication::addLibraryPath( QT_PLUGINS_DIR );`
`864`	`864`	`}`
`865`	`865`	`//next two lines should not be needed, testing only`
`866`	`866`	`#if 0`
Original file line number	Diff line number	Diff line change
`@@ -111,13 +111,11 @@ GlobePlugin::GlobePlugin( QgisInterface* theQgisInterface )`
`111`	`111`	`{`
`112`	`112`	`// OSG_PLUGINS_PATH value set by CMake option`
`113`	`113`	`QString ogsPlugins( OSG_PLUGINS_PATH );`
`114`		`-#ifdef HAVE_MACAPP_BUNDLED_OSG`
`115`		`- if ( !QgsApplication::isRunningFromBuildDir() )`
	`114`	`+ if ( QGIS_MACAPP_BUNDLE > 0 && !QgsApplication::isRunningFromBuildDir() )`
`116`	`115`	`{`
`117`	`116`	`// add internal osg plugin path if bundled osg`
`118`	`117`	`ogsPlugins = QgsApplication::pluginPath() + "/../osgPlugins";`
`119`	`118`	`}`
`120`		`-#endif`
`121`	`119`	`if ( QFile::exists( ogsPlugins ) )`
`122`	`120`	`{`
`123`	`121`	`osgDB::Registry::instance()->setLibraryFilePathList( QDir::cleanPath( ogsPlugins ).toStdString() );`