Skip to content
Permalink
Browse files

remove spatialindex include

  • Loading branch information
jef-n committed Nov 6, 2011
1 parent dfdd2bc commit 09f98fc9dcf7060c5963dfccd19684f66a497ab4
@@ -71,7 +71,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../core/
${CMAKE_CURRENT_SOURCE_DIR}/../core/renderer
${CMAKE_CURRENT_SOURCE_DIR}/../core/spatialindex
${CMAKE_CURRENT_SOURCE_DIR}/../core/raster
interpolation
${PROJ_INCLUDE_DIR}
@@ -34,13 +34,11 @@ SET(QGIS_NETWORK_ANALYSIS_HDRS
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}../../core/
${CMAKE_CURRENT_SOURCE_DIR}../../core/spatialindex
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
)


#############################################################
# qgis_analysis library

@@ -64,7 +64,7 @@ QgsComposerTableWidget::~QgsComposerTableWidget()

}

void QgsComposerTableWidget::showEvent( QShowEvent* event )
void QgsComposerTableWidget::showEvent( QShowEvent* /* event */ )
{
refreshMapComboBox();
}
@@ -173,8 +173,7 @@ SET(QGIS_CORE_SRCS
symbology/qgssymbologyutils.cpp

qgsspatialindex.cpp

)
)

IF(WIN32)
SET(QGIS_CORE_SRCS
@@ -400,7 +399,6 @@ INCLUDE_DIRECTORIES(
symbology
symbology-ng
gps/qextserialport
spatialindex/include
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
@@ -28,11 +28,11 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${GEOS_INCLUDE_DIR}
../../core
../../core/spatialindex
../../gui
../../analysis/network
..
)

########################################################
# Build

@@ -35,7 +35,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../../ui/
../../core
../../core/spatialindex
../../core/raster
../../core/renderer
../../core/symbology
@@ -3,7 +3,7 @@ SET (MEMORY_SRCS qgsmemoryprovider.cpp)

INCLUDE_DIRECTORIES(
.
../../core ../../core/spatialindex
../../core
${GEOS_INCLUDE_DIR}
)

@@ -57,7 +57,7 @@ QgsSpatiaLiteConnection::Error QgsSpatiaLiteConnection::fetchTables( bool loadGe
return FailedToOpen;
}

bool isSpatiaLite = checkHasMetadataTables( handle );
checkHasMetadataTables( handle );
if ( !mErrorMsg.isNull() )
{
// unexpected error; invalid SpatiaLite DB
@@ -31,7 +31,6 @@ QT4_WRAP_CPP(WFS_MOC_SRCS ${WFS_MOC_HDRS})

INCLUDE_DIRECTORIES (
../../core
../../core/spatialindex
../../gui
${CMAKE_CURRENT_BINARY_DIR}/../../ui
${GEOS_INCLUDE_DIR}

0 comments on commit 09f98fc

Please sign in to comment.
You can’t perform that action at this time.