Skip to content
Permalink
Browse files

avoid conflicting geos spatialindex.h include file

correct includes for spatialindex
  • Loading branch information
xzcvczx authored and nyalldawson committed Nov 15, 2018
1 parent 0557c70 commit f63c4e151cedfb2c6388f164bf937e44b6b862ee
Showing with 3 additions and 3 deletions.
  1. +1 −1 cmake/FindSpatialindex.cmake
  2. +1 −1 src/core/qgspointlocator.cpp
  3. +1 −1 src/core/qgsspatialindex.cpp
@@ -11,7 +11,7 @@
#


FIND_PATH(SPATIALINDEX_INCLUDE_DIR NAMES SpatialIndex.h PATHS
FIND_PATH(SPATIALINDEX_INCLUDE_DIR spatialindex/SpatialIndex.h PATHS
/usr/include
/usr/local/include
"$ENV{LIB_DIR}/include"
@@ -23,7 +23,7 @@
#include "qgslogger.h"
#include "qgsrenderer.h"

#include <SpatialIndex.h>
#include <spatialindex/SpatialIndex.h>

#include <QLinkedListIterator>

@@ -23,7 +23,7 @@
#include "qgsfeaturesource.h"
#include "qgsfeedback.h"

#include "SpatialIndex.h"
#include <spatialindex/SpatialIndex.h>
#include <QMutex>
#include <QMutexLocker>

0 comments on commit f63c4e1

Please sign in to comment.
You can’t perform that action at this time.