avoid conflicting geos spatialindex.h include file

xzcvczx · nyalldawson · commit c341d8da9038 · 2018-11-21T16:13:44.000+11:00
correct includes for spatialindex
diff --git a/cmake/FindSpatialindex.cmake b/cmake/FindSpatialindex.cmake
@@ -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"
diff --git a/src/core/qgspointlocator.cpp b/src/core/qgspointlocator.cpp
@@ -23,7 +23,7 @@
 #include "qgslogger.h"
 #include "qgsrenderer.h"
 
-#include <SpatialIndex.h>
+#include <spatialindex/SpatialIndex.h>
 
 #include <QLinkedListIterator>
 
diff --git a/src/core/qgsspatialindex.cpp b/src/core/qgsspatialindex.cpp
@@ -23,7 +23,7 @@
 #include "qgsfeaturesource.h"
 #include "qgsfeedback.h"
 
-#include "SpatialIndex.h"
+#include <spatialindex/SpatialIndex.h>
 #include <QMutex>
 #include <QMutexLocker>
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#`
`12`	`12`
`13`	`13`
`14`		`-FIND_PATH(SPATIALINDEX_INCLUDE_DIR NAMES SpatialIndex.h PATHS`
	`14`	`+FIND_PATH(SPATIALINDEX_INCLUDE_DIR spatialindex/SpatialIndex.h PATHS`
`15`	`15`	`/usr/include`
`16`	`16`	`/usr/local/include`
`17`	`17`	`"$ENV{LIB_DIR}/include"`