Skip to content

Commit

Permalink
Fix some more redundant geos includes in headers
Browse files Browse the repository at this point in the history
And re-add geos include directory for grass provider
  • Loading branch information
nyalldawson committed Apr 26, 2018
1 parent 83cb3da commit a5a91ec
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 3 deletions.
1 change: 1 addition & 0 deletions python/core/qgslabelsearchtree.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@




class QgsLabelSearchTree
{
%Docstring
Expand Down
1 change: 0 additions & 1 deletion src/analysis/vector/geometry_checker/qgsgeometrycheck.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include "qgsvectorlayer.h"
#include "geometry/qgsgeometry.h"
#include "qgsgeometrycheckerutils.h"
#include "geos_c.h"

class QgsGeometryCheckError;
class QgsFeaturePool;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "qgsgeometrygapcheck.h"
#include "qgsgeometrycollection.h"
#include "qgsfeaturepool.h"
#include "geos_c.h"

void QgsGeometryGapCheck::collectErrors( QList<QgsGeometryCheckError *> &errors, QStringList &messages, QAtomicInt *progressCounter, const QMap<QString, QgsFeatureIds> &ids ) const
{
Expand Down
9 changes: 7 additions & 2 deletions src/core/qgslabelsearchtree.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,18 @@
#include "qgis_sip.h"
#include <QList>
#include <QVector>
#include "pointset.h"
#include "labelposition.h"
#include "qgspallabeling.h"
#include "rtree.hpp"

class QgsPointXY;

#ifndef SIP_RUN
namespace pal
{
class LabelPosition;
}
#endif

/**
* \ingroup core
* A class to query the labeling structure at a given point (small wrapper around pal RTree class)
Expand Down
1 change: 1 addition & 0 deletions src/providers/grass/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ INCLUDE_DIRECTORIES(
)
INCLUDE_DIRECTORIES (SYSTEM
${GDAL_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${POSTGRES_INCLUDE_DIR}
)
Expand Down

0 comments on commit a5a91ec

Please sign in to comment.