Fixes from Martin for mac build issues

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6527 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: timlinux

src/core/CMakeLists.txt

@@ -89,6 +89,7 @@ raster/qgsrasterlayer.h
 QT4_WRAP_CPP(QGIS_CORE_MOC_SRCS ${QGIS_CORE_MOC_HDRS})
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} raster renderer symbology
+  spatialindex/include
   ${QT_QTSVG_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
   ${SQLITE3_INCLUDE_DIR}
@@ -123,8 +124,6 @@ PATH_PREFIX(SPINDEX_SRC spatialindex SpatialIndexImpl.cc)
 PATH_PREFIX(STMAN_SRC storagemanager Buffer.cc DiskStorageManager.cc MemoryStorageManager.cc RandomEvictionsBuffer.cc)
 PATH_PREFIX(RTREE_SRC rtree BulkLoader.cc Index.cc Leaf.cc Node.cc RTree.cc Statistics.cc)
 
-INCLUDE_DIRECTORIES(spatialindex/include)
-
 SET(SPINDEX_SRC ${TOOLS_SRC} ${GEOM_SRC} ${SPINDEX_SRC} ${STMAN_SRC} ${RTREE_SRC})
 
 PATH_PREFIX(INDEX_SRC spatialindex ${SPINDEX_SRC})

src/core/spatialindex/qgsspatialindex.cpp

@@ -20,7 +20,7 @@
 #include "qgsfeature.h"
 #include "qgsrect.h"
 
-#include <SpatialIndex.h>
+#include "SpatialIndex.h"
 
 using namespace SpatialIndex;