Skip to content
Permalink
Browse files

Remove some redundant geos includes

  • Loading branch information
nyalldawson committed Apr 26, 2018
1 parent d5626d9 commit 3f6e411edb6724e504e1cd4b57000b8dc1ece246
Showing with 0 additions and 36 deletions.
  1. +0 −1 python/CMakeLists.txt
  2. +0 −1 src/3d/CMakeLists.txt
  3. +0 −1 src/analysis/CMakeLists.txt
  4. +0 −1 src/gui/CMakeLists.txt
  5. +0 −1 src/plugins/coordinate_capture/CMakeLists.txt
  6. +0 −1 src/plugins/evis/CMakeLists.txt
  7. +0 −1 src/plugins/geometry_checker/CMakeLists.txt
  8. +0 −1 src/plugins/georeferencer/CMakeLists.txt
  9. +0 −1 src/plugins/gps_importer/CMakeLists.txt
  10. +0 −1 src/plugins/offline_editing/CMakeLists.txt
  11. +0 −1 src/providers/arcgisrest/CMakeLists.txt
  12. +0 −1 src/providers/db2/CMakeLists.txt
  13. +0 −1 src/providers/delimitedtext/CMakeLists.txt
  14. +0 −1 src/providers/gdal/CMakeLists.txt
  15. +0 −1 src/providers/geonode/CMakeLists.txt
  16. +0 −1 src/providers/gpx/CMakeLists.txt
  17. +0 −1 src/providers/grass/CMakeLists.txt
  18. +0 −1 src/providers/mssql/CMakeLists.txt
  19. +0 −1 src/providers/ogr/CMakeLists.txt
  20. +0 −1 src/providers/ows/CMakeLists.txt
  21. +0 −1 src/providers/postgres/CMakeLists.txt
  22. +0 −1 src/providers/spatialite/CMakeLists.txt
  23. +0 −1 src/providers/virtual/CMakeLists.txt
  24. +0 −1 src/providers/wcs/CMakeLists.txt
  25. +0 −1 src/providers/wfs/CMakeLists.txt
  26. +0 −1 src/providers/wms/CMakeLists.txt
  27. +0 −1 src/server/CMakeLists.txt
  28. +0 −1 src/server/services/wcs/CMakeLists.txt
  29. +0 −1 src/server/services/wfs/CMakeLists.txt
  30. +0 −1 src/server/services/wms/CMakeLists.txt
  31. +0 −1 tests/bench/CMakeLists.txt
  32. +0 −1 tests/src/3d/CMakeLists.txt
  33. +0 −1 tests/src/geometry_checker/CMakeLists.txt
  34. +0 −1 tests/src/gui/CMakeLists.txt
  35. +0 −1 tests/src/providers/CMakeLists.txt
  36. +0 −1 tests/src/providers/grass/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}
@@ -133,7 +133,6 @@ INCLUDE_DIRECTORIES(
)
INCLUDE_DIRECTORIES(SYSTEM
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
)
@@ -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}
)
@@ -911,7 +911,6 @@ INCLUDE_DIRECTORIES(SYSTEM
${QWT_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
${QSCINTILLA_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
)

@@ -41,7 +41,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}/src/ui
)
INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
)

TARGET_LINK_LIBRARIES(coordinatecaptureplugin
@@ -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(
@@ -65,7 +65,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
)
INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
)

@@ -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}
)
@@ -51,7 +51,6 @@ INCLUDE_DIRECTORIES(SYSTEM
${EXPAT_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${QEXTSERIALPORT_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
)

TARGET_LINK_LIBRARIES(gpsimporterplugin
@@ -46,7 +46,6 @@ TARGET_LINK_LIBRARIES(offlineeditingplugin
INCLUDE_DIRECTORIES(SYSTEM
${SPATIALITE_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
)

INCLUDE_DIRECTORIES(
@@ -14,7 +14,6 @@ INCLUDE_DIRECTORIES(
)

INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
)

IF (WITH_GUI)
@@ -48,7 +48,6 @@ INCLUDE_DIRECTORIES(
)

INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
${QT_INCLUDE_DIR}
)

@@ -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})
@@ -35,7 +35,6 @@ INCLUDE_DIRECTORIES (
)
INCLUDE_DIRECTORIES (SYSTEM
${GDAL_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${QTKEYCHAIN_INCLUDE_DIR}
${QCA_INCLUDE_DIR}
)
@@ -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})
@@ -25,7 +25,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}/src/gui
)
INCLUDE_DIRECTORIES (SYSTEM
${GEOS_INCLUDE_DIR}
${EXPAT_INCLUDE_DIR}
)

@@ -18,7 +18,6 @@ INCLUDE_DIRECTORIES(
INCLUDE_DIRECTORIES (SYSTEM
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${POSTGRES_INCLUDE_DIR}
)

@@ -48,7 +48,6 @@ INCLUDE_DIRECTORIES(
)
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${QT_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
)
@@ -54,7 +54,6 @@ INCLUDE_DIRECTORIES(
)
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${QTKEYCHAIN_INCLUDE_DIR}
${QCA_INCLUDE_DIR}
${QSCINTILLA_INCLUDE_DIR}
@@ -22,7 +22,6 @@ INCLUDE_DIRECTORIES (
)
INCLUDE_DIRECTORIES(SYSTEM
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
)

QT5_WRAP_CPP(OWS_MOC_SRCS ${OWS_MOC_HDRS})
@@ -64,7 +64,6 @@ INCLUDE_DIRECTORIES(

INCLUDE_DIRECTORIES(SYSTEM
${POSTGRES_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${QCA_INCLUDE_DIR}
${QTKEYCHAIN_INCLUDE_DIR}
)
@@ -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})
@@ -55,7 +55,6 @@ INCLUDE_DIRECTORIES(SYSTEM
${POSTGRES_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
${SPATIALITE_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${QCA_INCLUDE_DIR}
)

@@ -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})
@@ -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}
@@ -49,7 +49,6 @@ INCLUDE_DIRECTORIES(
)
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${QCA_INCLUDE_DIR}
${QTKEYCHAIN_INCLUDE_DIR}
)
@@ -86,7 +86,6 @@ ENDIF(MSVC)
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
${FCGI_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${POSTGRES_INCLUDE_DIR}
)
@@ -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}
)
@@ -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}
)
@@ -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}
)
@@ -28,7 +28,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}/src/core
)
INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
)

@@ -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
@@ -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}
@@ -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}
@@ -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}
@@ -4,7 +4,6 @@ INCLUDE_DIRECTORIES(
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${POSTGRES_INCLUDE_DIR}
)

1 comment on commit 3f6e411

@telwertowski

This comment has been minimized.

Copy link
Contributor

@telwertowski telwertowski commented on 3f6e411 Apr 26, 2018

macOS needs GEOS for python, src/analysis, src/plugins/geometry_checker and src/providers/grass

In file included from /Users/tce/Developer/qgis/build/python/core/qgslabelsearchtree.sip:20:
In file included from /Users/tce/Developer/qgis/QGIS/src/core/qgslabelsearchtree.h:26:
/Users/tce/Developer/qgis/QGIS/src/core/pal/pointset.h:39:10: fatal error: 
      'geos_c.h' file not found
#include <geos_c.h>

In file included from /Users/tce/Developer/qgis/QGIS/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp:18:
/Users/tce/Developer/qgis/QGIS/src/analysis/vector/geometry_checker/qgsgeometrycheck.h:29:10: fatal error: 
      'geos_c.h' file not found
#include "geos_c.h"

In file included from /Users/tce/Developer/qgis/QGIS/src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp:22:
/Users/tce/Developer/qgis/QGIS/src/analysis/vector/geometry_checker/qgsgeometrycheck.h:29:10: fatal error: 
      'geos_c.h' file not found
#include "geos_c.h"

In file included from /Users/tce/Developer/qgis/QGIS/src/providers/grass/qgsgrass.cpp:69:
/Users/tce/Developer/packages/grass-7.4.0/dist.x86_64-apple-darwin17.4.0/include/grass/vector.h:7:10: fatal error: 
      'geos_c.h' file not found
#include <geos_c.h>

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