Skip to content

Commit 50e5041

Browse files
author
timlinux
committed
Fixes from Martin for mac build issues
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6527 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent b6c97d1 commit 50e5041

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/core/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ raster/qgsrasterlayer.h
8989
QT4_WRAP_CPP(QGIS_CORE_MOC_SRCS ${QGIS_CORE_MOC_HDRS})
9090

9191
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} raster renderer symbology
92+
spatialindex/include
9293
${QT_QTSVG_INCLUDE_DIR}
9394
${PROJ_INCLUDE_DIR}
9495
${SQLITE3_INCLUDE_DIR}
@@ -123,8 +124,6 @@ PATH_PREFIX(SPINDEX_SRC spatialindex SpatialIndexImpl.cc)
123124
PATH_PREFIX(STMAN_SRC storagemanager Buffer.cc DiskStorageManager.cc MemoryStorageManager.cc RandomEvictionsBuffer.cc)
124125
PATH_PREFIX(RTREE_SRC rtree BulkLoader.cc Index.cc Leaf.cc Node.cc RTree.cc Statistics.cc)
125126

126-
INCLUDE_DIRECTORIES(spatialindex/include)
127-
128127
SET(SPINDEX_SRC ${TOOLS_SRC} ${GEOM_SRC} ${SPINDEX_SRC} ${STMAN_SRC} ${RTREE_SRC})
129128

130129
PATH_PREFIX(INDEX_SRC spatialindex ${SPINDEX_SRC})

src/core/spatialindex/qgsspatialindex.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "qgsfeature.h"
2121
#include "qgsrect.h"
2222

23-
#include <SpatialIndex.h>
23+
#include "SpatialIndex.h"
2424

2525
using namespace SpatialIndex;
2626

0 commit comments

Comments
 (0)