Skip to content
Permalink
Browse files

Remove some more redundant include directories

  • Loading branch information
nyalldawson committed Apr 26, 2018
1 parent 3f6e411 commit d8c36233e80aa7554c6ccd5188f6d7c3131619ed
@@ -132,7 +132,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}/src/3d
)
INCLUDE_DIRECTORIES(SYSTEM
${PROJ_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
)
@@ -275,7 +275,6 @@ INCLUDE_DIRECTORIES(
)
INCLUDE_DIRECTORIES(SYSTEM
${SPATIALINDEX_INCLUDE_DIR} # before GEOS for case-insensitive filesystems
${PROJ_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
)
@@ -48,8 +48,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
)
INCLUDE_DIRECTORIES(SYSTEM
${EXPAT_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${QEXTSERIALPORT_INCLUDE_DIR}
)

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

@@ -49,7 +49,6 @@ INCLUDE_DIRECTORIES(
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
${QT_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
)

IF (WITH_GUI)
@@ -21,7 +21,6 @@ INCLUDE_DIRECTORIES (
${CMAKE_BINARY_DIR}/src/ui
)
INCLUDE_DIRECTORIES(SYSTEM
${PROJ_INCLUDE_DIR}
)

QT5_WRAP_CPP(OWS_MOC_SRCS ${OWS_MOC_HDRS})
@@ -86,7 +86,6 @@ ENDIF(MSVC)
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
${FCGI_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${POSTGRES_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
@@ -18,7 +18,6 @@ ADD_LIBRARY (wcs MODULE ${wcs_SRCS})

INCLUDE_DIRECTORIES(SYSTEM
${GDAL_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}
${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}
${PROJ_INCLUDE_DIR}
${POSTGRES_INCLUDE_DIR}
)

@@ -32,7 +32,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
INCLUDE_DIRECTORIES(SYSTEM
${QT_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
)

#note for tests we should not include the moc of our
@@ -30,7 +30,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
INCLUDE_DIRECTORIES(SYSTEM
${QT_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
)
@@ -35,7 +35,6 @@ INCLUDE_DIRECTORIES(SYSTEM
${QT_INCLUDE_DIR}
${QWT_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${QCA_INCLUDE_DIR}
${QTKEYCHAIN_INCLUDE_DIR}
@@ -19,7 +19,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
INCLUDE_DIRECTORIES(SYSTEM
${QT_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${QCA_INCLUDE_DIR}
${QTKEYCHAIN_INCLUDE_DIR}
${POSTGRES_INCLUDE_DIR}
@@ -38,7 +38,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
INCLUDE_DIRECTORIES(SYSTEM
${QT_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${QWT_INCLUDE_DIR}
${QCA_INCLUDE_DIR}
${QTKEYCHAIN_INCLUDE_DIR}
@@ -21,7 +21,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
INCLUDE_DIRECTORIES(SYSTEM
${QT_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${QCA_INCLUDE_DIR}
${QTKEYCHAIN_INCLUDE_DIR}
${POSTGRES_INCLUDE_DIR}
@@ -3,7 +3,6 @@ INCLUDE_DIRECTORIES(
)
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${POSTGRES_INCLUDE_DIR}
)

1 comment on commit d8c3623

@telwertowski

This comment has been minimized.

Copy link
Contributor

@telwertowski telwertowski commented on d8c3623 Apr 26, 2018

macOS needs PROJ for src/providers/grass

In file included from /Users/tce/Developer/qgis/QGIS/src/providers/grass/qgis.g.info.c:38:
/Users/tce/Developer/packages/grass-7.4.0/dist.x86_64-apple-darwin17.4.0/include/grass/gprojects.h:21:10: fatal error: 
      'proj_api.h' file not found
#include <proj_api.h>

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