Remove some redundant geos includes

nyalldawson · nyalldawson · commit 3f6e411edb67 · 2018-04-26T17:28:59.000+12:00
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -86,7 +86,6 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${QT_QTSVG_INCLUDE_DIR}
   ${QT_QTXML_INCLUDE_DIR}
   ${GDAL_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${QWT_INCLUDE_DIR}
   ${QEXTSERIALPORT_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
diff --git a/src/3d/CMakeLists.txt b/src/3d/CMakeLists.txt
@@ -133,7 +133,6 @@ INCLUDE_DIRECTORIES(
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${PROJ_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${GDAL_INCLUDE_DIR}
   ${SQLITE3_INCLUDE_DIR}
 )
diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -276,7 +276,6 @@ INCLUDE_DIRECTORIES(
 INCLUDE_DIRECTORIES(SYSTEM
   ${SPATIALINDEX_INCLUDE_DIR} # before GEOS for case-insensitive filesystems
   ${PROJ_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${GDAL_INCLUDE_DIR}
   ${SQLITE3_INCLUDE_DIR}
 )
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -911,7 +911,6 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${QWT_INCLUDE_DIR}
   ${SQLITE3_INCLUDE_DIR}
   ${QSCINTILLA_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${GDAL_INCLUDE_DIR}
 )
 
diff --git a/src/plugins/coordinate_capture/CMakeLists.txt b/src/plugins/coordinate_capture/CMakeLists.txt
@@ -41,7 +41,6 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_BINARY_DIR}/src/ui
 )
 INCLUDE_DIRECTORIES(SYSTEM
-  ${GEOS_INCLUDE_DIR}
 )
 
 TARGET_LINK_LIBRARIES(coordinatecaptureplugin
diff --git a/src/plugins/evis/CMakeLists.txt b/src/plugins/evis/CMakeLists.txt
@@ -50,7 +50,6 @@ ADD_LIBRARY (evis MODULE ${evis_SRCS} ${evis_MOC_SRCS} ${evis_RCC_SRCS} ${evis_U
 
 INCLUDE_DIRECTORIES(SYSTEM
   ${GDAL_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${QT_INCLUDE_DIR}
 )
 INCLUDE_DIRECTORIES(
diff --git a/src/plugins/geometry_checker/CMakeLists.txt b/src/plugins/geometry_checker/CMakeLists.txt
@@ -65,7 +65,6 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 INCLUDE_DIRECTORIES(SYSTEM
-  ${GEOS_INCLUDE_DIR}
   ${GDAL_INCLUDE_DIR}
 )
 
diff --git a/src/plugins/georeferencer/CMakeLists.txt b/src/plugins/georeferencer/CMakeLists.txt
@@ -97,7 +97,6 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${GSL_INCLUDE_DIR}
   ${QGIS_INCLUDE_DIR}
   ${GDAL_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${QT_QTXML_INCLUDE_DIR}
   ${QWT_INCLUDE_DIR}
 )
diff --git a/src/plugins/gps_importer/CMakeLists.txt b/src/plugins/gps_importer/CMakeLists.txt
@@ -51,7 +51,6 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${EXPAT_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
   ${QEXTSERIALPORT_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
 )
 
 TARGET_LINK_LIBRARIES(gpsimporterplugin
diff --git a/src/plugins/offline_editing/CMakeLists.txt b/src/plugins/offline_editing/CMakeLists.txt
@@ -46,7 +46,6 @@ TARGET_LINK_LIBRARIES(offlineeditingplugin
 INCLUDE_DIRECTORIES(SYSTEM
   ${SPATIALITE_INCLUDE_DIR}
   ${SQLITE3_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
 )
 
 INCLUDE_DIRECTORIES(
diff --git a/src/providers/arcgisrest/CMakeLists.txt b/src/providers/arcgisrest/CMakeLists.txt
@@ -14,7 +14,6 @@ INCLUDE_DIRECTORIES(
 )
 
 INCLUDE_DIRECTORIES(SYSTEM
-  ${GEOS_INCLUDE_DIR}
 )
 
 IF (WITH_GUI)
diff --git a/src/providers/db2/CMakeLists.txt b/src/providers/db2/CMakeLists.txt
@@ -48,7 +48,6 @@ INCLUDE_DIRECTORIES(
 )
 
 INCLUDE_DIRECTORIES(SYSTEM
-  ${GEOS_INCLUDE_DIR}
   ${QT_INCLUDE_DIR}
 )
 
diff --git a/src/providers/delimitedtext/CMakeLists.txt b/src/providers/delimitedtext/CMakeLists.txt
@@ -37,7 +37,6 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_BINARY_DIR}/src/ui
 )
 INCLUDE_DIRECTORIES (SYSTEM
-  ${GEOS_INCLUDE_DIR}
 )
 
 QT5_WRAP_CPP(DTEXT_MOC_SRCS ${DTEXT_MOC_HDRS})
diff --git a/src/providers/gdal/CMakeLists.txt b/src/providers/gdal/CMakeLists.txt
@@ -35,7 +35,6 @@ INCLUDE_DIRECTORIES (
 )
 INCLUDE_DIRECTORIES (SYSTEM
   ${GDAL_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
 )
diff --git a/src/providers/geonode/CMakeLists.txt b/src/providers/geonode/CMakeLists.txt
@@ -41,7 +41,6 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_BINARY_DIR}/src/ui
 )
 INCLUDE_DIRECTORIES(SYSTEM
-  ${GEOS_INCLUDE_DIR}
 )
 
 ADD_LIBRARY(geonodeprovider MODULE ${GEONODE_SRCS} ${GEONODE_MOC_SRCS})
diff --git a/src/providers/gpx/CMakeLists.txt b/src/providers/gpx/CMakeLists.txt
@@ -25,7 +25,6 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_BINARY_DIR}/src/gui
 )
 INCLUDE_DIRECTORIES (SYSTEM
-  ${GEOS_INCLUDE_DIR}
   ${EXPAT_INCLUDE_DIR}
 )
 
diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt
@@ -18,7 +18,6 @@ INCLUDE_DIRECTORIES(
 INCLUDE_DIRECTORIES (SYSTEM
   ${GDAL_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${POSTGRES_INCLUDE_DIR}
 )
 
diff --git a/src/providers/mssql/CMakeLists.txt b/src/providers/mssql/CMakeLists.txt
@@ -48,7 +48,6 @@ INCLUDE_DIRECTORIES(
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${GDAL_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${QT_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
 )
diff --git a/src/providers/ogr/CMakeLists.txt b/src/providers/ogr/CMakeLists.txt
@@ -54,7 +54,6 @@ INCLUDE_DIRECTORIES(
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${GDAL_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
   ${QSCINTILLA_INCLUDE_DIR}
diff --git a/src/providers/ows/CMakeLists.txt b/src/providers/ows/CMakeLists.txt
@@ -22,7 +22,6 @@ INCLUDE_DIRECTORIES (
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${PROJ_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
 )
 
 QT5_WRAP_CPP(OWS_MOC_SRCS ${OWS_MOC_HDRS})
diff --git a/src/providers/postgres/CMakeLists.txt b/src/providers/postgres/CMakeLists.txt
@@ -64,7 +64,6 @@ INCLUDE_DIRECTORIES(
 
 INCLUDE_DIRECTORIES(SYSTEM
   ${POSTGRES_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
 )
diff --git a/src/providers/spatialite/CMakeLists.txt b/src/providers/spatialite/CMakeLists.txt
@@ -57,7 +57,6 @@ INCLUDE_DIRECTORIES(
 INCLUDE_DIRECTORIES(SYSTEM
   ${SQLITE3_INCLUDE_DIR}
   ${SPATIALITE_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
 )
 
 ADD_LIBRARY (spatialiteprovider MODULE ${SPATIALITE_SRCS} ${SPATIALITE_MOC_SRCS})
diff --git a/src/providers/virtual/CMakeLists.txt b/src/providers/virtual/CMakeLists.txt
@@ -55,7 +55,6 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${POSTGRES_INCLUDE_DIR}
   ${SQLITE3_INCLUDE_DIR}
   ${SPATIALITE_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
 )
 
diff --git a/src/providers/wcs/CMakeLists.txt b/src/providers/wcs/CMakeLists.txt
@@ -42,7 +42,6 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${GDAL_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
 )
 
 ADD_LIBRARY(wcsprovider MODULE ${WCS_SRCS} ${WCS_MOC_SRCS})
diff --git a/src/providers/wfs/CMakeLists.txt b/src/providers/wfs/CMakeLists.txt
@@ -60,7 +60,6 @@ INCLUDE_DIRECTORIES (
   ${CMAKE_BINARY_DIR}/src/ui
 )
 INCLUDE_DIRECTORIES(SYSTEM
-  ${GEOS_INCLUDE_DIR}
   ${EXPAT_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
diff --git a/src/providers/wms/CMakeLists.txt b/src/providers/wms/CMakeLists.txt
@@ -49,7 +49,6 @@ INCLUDE_DIRECTORIES(
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${GDAL_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
 )
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -86,7 +86,6 @@ ENDIF(MSVC)
 INCLUDE_DIRECTORIES(SYSTEM
   ${GDAL_INCLUDE_DIR}
   ${FCGI_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
   ${POSTGRES_INCLUDE_DIR}
 )
diff --git a/src/server/services/wcs/CMakeLists.txt b/src/server/services/wcs/CMakeLists.txt
@@ -18,7 +18,6 @@ ADD_LIBRARY (wcs MODULE ${wcs_SRCS})
 
 INCLUDE_DIRECTORIES(SYSTEM
   ${GDAL_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
   ${POSTGRES_INCLUDE_DIR}
 )
diff --git a/src/server/services/wfs/CMakeLists.txt b/src/server/services/wfs/CMakeLists.txt
@@ -28,7 +28,6 @@ ADD_LIBRARY (wfs MODULE ${wfs_SRCS} ${wfs_MOC_SRCS} ${wfs_MOC_HDRS})
 
 INCLUDE_DIRECTORIES(SYSTEM
   ${GDAL_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
   ${POSTGRES_INCLUDE_DIR}
 )
diff --git a/src/server/services/wms/CMakeLists.txt b/src/server/services/wms/CMakeLists.txt
@@ -36,7 +36,6 @@ ADD_LIBRARY (wms MODULE ${wms_SRCS} ${wms_MOC_SRCS} ${wms_MOC_HDRS})
 
 INCLUDE_DIRECTORIES(SYSTEM
   ${GDAL_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
   ${POSTGRES_INCLUDE_DIR}
 )
diff --git a/tests/bench/CMakeLists.txt b/tests/bench/CMakeLists.txt
@@ -28,7 +28,6 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_BINARY_DIR}/src/core
 )
 INCLUDE_DIRECTORIES(SYSTEM
-  ${GEOS_INCLUDE_DIR}
   ${SQLITE3_INCLUDE_DIR}
 )
 
diff --git a/tests/src/3d/CMakeLists.txt b/tests/src/3d/CMakeLists.txt
@@ -33,7 +33,6 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${QT_INCLUDE_DIR}
   ${GDAL_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
 )
 
 #note for tests we should not include the moc of our
diff --git a/tests/src/geometry_checker/CMakeLists.txt b/tests/src/geometry_checker/CMakeLists.txt
@@ -20,7 +20,6 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${QT_INCLUDE_DIR}
   ${GDAL_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
   ${POSTGRES_INCLUDE_DIR}
diff --git a/tests/src/gui/CMakeLists.txt b/tests/src/gui/CMakeLists.txt
@@ -39,7 +39,6 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${QT_INCLUDE_DIR}
   ${GDAL_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${QWT_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
diff --git a/tests/src/providers/CMakeLists.txt b/tests/src/providers/CMakeLists.txt
@@ -22,7 +22,6 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${QT_INCLUDE_DIR}
   ${GDAL_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
   ${POSTGRES_INCLUDE_DIR}
diff --git a/tests/src/providers/grass/CMakeLists.txt b/tests/src/providers/grass/CMakeLists.txt
@@ -4,7 +4,6 @@ INCLUDE_DIRECTORIES(
 INCLUDE_DIRECTORIES(SYSTEM
   ${GDAL_INCLUDE_DIR}
   ${PROJ_INCLUDE_DIR}
-  ${GEOS_INCLUDE_DIR}
   ${POSTGRES_INCLUDE_DIR}
 )
 

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,6 @@ INCLUDE_DIRECTORIES(`
`133`	`133`	`)`
`134`	`134`	`INCLUDE_DIRECTORIES(SYSTEM`
`135`	`135`	`${PROJ_INCLUDE_DIR}`
`136`		`- ${GEOS_INCLUDE_DIR}`
`137`	`136`	`${GDAL_INCLUDE_DIR}`
`138`	`137`	`${SQLITE3_INCLUDE_DIR}`
`139`	`138`	`)`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,6 @@ INCLUDE_DIRECTORIES(`
`276`	`276`	`INCLUDE_DIRECTORIES(SYSTEM`
`277`	`277`	`${SPATIALINDEX_INCLUDE_DIR} # before GEOS for case-insensitive filesystems`
`278`	`278`	`${PROJ_INCLUDE_DIR}`
`279`		`- ${GEOS_INCLUDE_DIR}`
`280`	`279`	`${GDAL_INCLUDE_DIR}`
`281`	`280`	`${SQLITE3_INCLUDE_DIR}`
`282`	`281`	`)`
Original file line number	Diff line number	Diff line change
`@@ -911,7 +911,6 @@ INCLUDE_DIRECTORIES(SYSTEM`
`911`	`911`	`${QWT_INCLUDE_DIR}`
`912`	`912`	`${SQLITE3_INCLUDE_DIR}`
`913`	`913`	`${QSCINTILLA_INCLUDE_DIR}`
`914`		`- ${GEOS_INCLUDE_DIR}`
`915`	`914`	`${GDAL_INCLUDE_DIR}`
`916`	`915`	`)`
`917`	`916`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ INCLUDE_DIRECTORIES(`
`41`	`41`	`${CMAKE_BINARY_DIR}/src/ui`
`42`	`42`	`)`
`43`	`43`	`INCLUDE_DIRECTORIES(SYSTEM`
`44`		`- ${GEOS_INCLUDE_DIR}`
`45`	`44`	`)`
`46`	`45`
`47`	`46`	`TARGET_LINK_LIBRARIES(coordinatecaptureplugin`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,6 @@ ADD_LIBRARY (evis MODULE ${evis_SRCS} ${evis_MOC_SRCS} ${evis_RCC_SRCS} ${evis_U`
`50`	`50`
`51`	`51`	`INCLUDE_DIRECTORIES(SYSTEM`
`52`	`52`	`${GDAL_INCLUDE_DIR}`
`53`		`- ${GEOS_INCLUDE_DIR}`
`54`	`53`	`${QT_INCLUDE_DIR}`
`55`	`54`	`)`
`56`	`55`	`INCLUDE_DIRECTORIES(`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ INCLUDE_DIRECTORIES(`
`65`	`65`	`${CMAKE_CURRENT_SOURCE_DIR}`
`66`	`66`	`)`
`67`	`67`	`INCLUDE_DIRECTORIES(SYSTEM`
`68`		`- ${GEOS_INCLUDE_DIR}`
`69`	`68`	`${GDAL_INCLUDE_DIR}`
`70`	`69`	`)`
`71`	`70`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,6 @@ INCLUDE_DIRECTORIES(SYSTEM`
`97`	`97`	`${GSL_INCLUDE_DIR}`
`98`	`98`	`${QGIS_INCLUDE_DIR}`
`99`	`99`	`${GDAL_INCLUDE_DIR}`
`100`		`- ${GEOS_INCLUDE_DIR}`
`101`	`100`	`${QT_QTXML_INCLUDE_DIR}`
`102`	`101`	`${QWT_INCLUDE_DIR}`
`103`	`102`	`)`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ INCLUDE_DIRECTORIES(SYSTEM`
`51`	`51`	`${EXPAT_INCLUDE_DIR}`
`52`	`52`	`${PROJ_INCLUDE_DIR}`
`53`	`53`	`${QEXTSERIALPORT_INCLUDE_DIR}`
`54`		`- ${GEOS_INCLUDE_DIR}`
`55`	`54`	`)`
`56`	`55`
`57`	`56`	`TARGET_LINK_LIBRARIES(gpsimporterplugin`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ TARGET_LINK_LIBRARIES(offlineeditingplugin`
`46`	`46`	`INCLUDE_DIRECTORIES(SYSTEM`
`47`	`47`	`${SPATIALITE_INCLUDE_DIR}`
`48`	`48`	`${SQLITE3_INCLUDE_DIR}`
`49`		`- ${GEOS_INCLUDE_DIR}`
`50`	`49`	`)`
`51`	`50`
`52`	`51`	`INCLUDE_DIRECTORIES(`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ INCLUDE_DIRECTORIES(`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`INCLUDE_DIRECTORIES(SYSTEM`
`17`		`- ${GEOS_INCLUDE_DIR}`
`18`	`17`	`)`
`19`	`18`
`20`	`19`	`IF (WITH_GUI)`