Skip to content

Commit

Permalink
check for bundled GRASS for gisbase on OS X
Browse files Browse the repository at this point in the history
  • Loading branch information
kyngchaos committed Aug 17, 2013
1 parent 414338f commit 2a29483
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/providers/grass/qgsgrass.cpp
Expand Up @@ -142,6 +142,14 @@ void GRASS_LIB_EXPORT QgsGrass::init( void )
// Use the applicationDirPath()/grass
gisBase = shortPath( QCoreApplication::applicationDirPath() + "/grass" );
QgsDebugMsg( QString( "GRASS gisBase = %1" ).arg( gisBase ) );
#elif defined(Q_OS_MACX)
// check for bundled GRASS, fall back to configured path
gisBase = QCoreApplication::applicationDirPath().append("/grass") ;
if ( !isValidGrassBaseDir( gisBase ) )
{
gisBase = GRASS_BASE;
}
QgsDebugMsg( QString( "GRASS gisBase = %1" ).arg( gisBase ) );
#else
// Use the location specified --with-grass during configure
gisBase = GRASS_BASE;
Expand Down

0 comments on commit 2a29483

Please sign in to comment.