Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
avoid conflicting geos spatialindex.h include file
correct includes for spatialindex
  • Loading branch information
xzcvczx authored and nyalldawson committed Feb 6, 2019
1 parent 0557c70 commit f63c4e1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cmake/FindSpatialindex.cmake
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgspointlocator.cpp
Expand Up @@ -23,7 +23,7 @@
#include "qgslogger.h"
#include "qgsrenderer.h"

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

#include <QLinkedListIterator>

Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsspatialindex.cpp
Expand Up @@ -23,7 +23,7 @@
#include "qgsfeaturesource.h"
#include "qgsfeedback.h"

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

Expand Down

0 comments on commit f63c4e1

Please sign in to comment.