[travis] Enable tests for Grass 7

qgis · Sep 17, 2015 · f4d9e6f · f4d9e6f
1 parent 55dbc04
commit f4d9e6f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ci/travis/linux/install.sh b/ci/travis/linux/install.sh
@@ -1,5 +1,7 @@
 mkdir build
 cd build
 cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=ON \
-          -DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON -DENABLE_PGTEST=ON \
-          -DWITH_QWTPOLAR=OFF -DWITH_APIDOC=ON -DWITH_PYSPATIALITE=ON ..
+          -DWITH_GRASS7=ON -DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON \
+          -DENABLE_PGTEST=ON -DWITH_QWTPOLAR=OFF -DWITH_APIDOC=ON \
+          -DWITH_PYSPATIALITE=ON -DGRASS_PREFIX7=/usr/lib/grass70 \
+          -DGRASS_INCLUDE_DIR7=/usr/lib/grass70/include ..
diff --git a/src/providers/grass/qgis.d.rast.c b/src/providers/grass/qgis.d.rast.c
@@ -79,7 +79,6 @@ int main( int argc, char **argv )
   G_gisinit( argv[0] );
 
   module = G_define_module();
-  module->keywords = ( "display, raster" );
   module->description = ( "Output raster map layers in a format suitable for display in QGIS" );
 
   map = G_define_standard_option( G_OPT_R_MAP );