mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-12 00:06:43 -04:00
avoid conflicting geos spatialindex.h include file
correct includes for spatialindex
This commit is contained in:
parent
cd0a314114
commit
c341d8da90
@ -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>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user