fix build problems with GRASS 6.5 GEOS support and #1723

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10893 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jun 9, 2009 · 9e3a3a9 · 9e3a3a9
1 parent ab50488
commit 9e3a3a9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/python/core/qgssymbol.sip b/python/core/qgssymbol.sip
@@ -72,7 +72,7 @@ class QgsSymbol
     /** Get QImage representation of point symbol with current settings
      * and scaled (can be slow when scale != 1.0)
      */
-    virtual QImage getPointSymbolAsImage( double widthScale = 1.,
+    virtual QImage getPointSymbolAsImage( double widthScale = 1.0,
                                           bool selected = false,
                                           QColor selectionColor = Qt::yellow,
                                           double scale = 1.0,

diff --git a/src/core/symbology/qgssymbol.h b/src/core/symbology/qgssymbol.h
@@ -101,13 +101,13 @@ class CORE_EXPORT QgsSymbol
 
     /** Get QImage representation of point symbol with current settings
     */
-    virtual QImage getCachedPointSymbolAsImage( double widthScale = 1.,
+    virtual QImage getCachedPointSymbolAsImage( double widthScale = 1.0,
         bool selected = false, QColor selectionColor = Qt::yellow );
 
     /** Get QImage representation of point symbol with current settings
      * and scaled (can be slow when scale != 1.0)
      */
-    virtual QImage getPointSymbolAsImage( double widthScale = 1.,
+    virtual QImage getPointSymbolAsImage( double widthScale = 1.0,
                                           bool selected = false,
                                           QColor selectionColor = Qt::yellow,
                                           double scale = 1.0,

diff --git a/src/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt
@@ -142,6 +142,7 @@ INCLUDE_DIRECTORIES(
      ${GRASS_INCLUDE_DIR}
      ${GDAL_INCLUDE_DIR}
      ${PROJ_INCLUDE_DIR}
+     ${GEOS_INCLUDE_DIR}
      qtermwidget
 )
 

diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt
@@ -27,6 +27,7 @@ INCLUDE_DIRECTORIES (
   ${GRASS_INCLUDE_DIR}
   ${GDAL_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
+  ${GEOS_INCLUDE_DIR}
 )