fix build problems with GRASS 6.5 GEOS support and #1723

jef · jef · commit c45c93c47ed2 · 2009-06-09T06:57:55.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@10893 c8812cc2-4d05-0410-92ff-de0c093fc19c
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}
 )
 
 

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,7 @@ INCLUDE_DIRECTORIES(`
`142`	`142`	`${GRASS_INCLUDE_DIR}`
`143`	`143`	`${GDAL_INCLUDE_DIR}`
`144`	`144`	`${PROJ_INCLUDE_DIR}`
	`145`	`+ ${GEOS_INCLUDE_DIR}`
`145`	`146`	`qtermwidget`
`146`	`147`	`)`
`147`	`148`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ INCLUDE_DIRECTORIES (`
`27`	`27`	`${GRASS_INCLUDE_DIR}`
`28`	`28`	`${GDAL_INCLUDE_DIR}`
`29`	`29`	`${PROJ_INCLUDE_DIR}`
	`30`	`+ ${GEOS_INCLUDE_DIR}`
`30`	`31`	`)`
`31`	`32`
`32`	`33`