Skip to content
Permalink
Browse files

Mark more includes as system includes

  • Loading branch information
nyalldawson committed Jan 8, 2016
1 parent ae2738e commit 87c58f45417e1a55d47346a6d85d1c4dd83436ed
@@ -64,7 +64,7 @@ IF(POLICY CMP0040)
CMAKE_POLICY (POP) # see PUSH above
ENDIF(POLICY CMP0040)

INCLUDE_DIRECTORIES(
INCLUDE_DIRECTORIES(SYSTEM
${PYTHON_INCLUDE_PATH}
${SIP_INCLUDE_DIR}
${QT_QTCORE_INCLUDE_DIR}
@@ -78,7 +78,8 @@ INCLUDE_DIRECTORIES(
${QEXTSERIALPORT_INCLUDE_DIR}
${QSCINTILLA_INCLUDE_DIR}
${QCA_INCLUDE_DIR}

)
INCLUDE_DIRECTORIES(
../src/core
../src/core/auth
../src/core/pal
@@ -35,6 +35,8 @@ INCLUDE_DIRECTORIES(
../../core/raster
../../gui
..
)
INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
)

@@ -54,11 +54,14 @@ QT4_ADD_RESOURCES(globe_plugin_RCC_SRCS ${globe_plugin_RCCS})

ADD_LIBRARY (globeplugin MODULE ${globe_plugin_SRCS} ${globe_plugin_MOC_SRCS} ${globe_plugin_RCC_SRCS} ${globe_plugin_UIS_H})

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
INCLUDE_DIRECTORIES(SYSTEM
${OSGEARTH_INCLUDE_DIR}
${OSG_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
)

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
../../core ../../core/geometry ../../core/raster
../../gui
..
@@ -43,6 +43,8 @@ INCLUDE_DIRECTORIES(
../../core/gps
../../gui
..
)
INCLUDE_DIRECTORIES(SYSTEM
${EXPAT_INCLUDE_DIR}
)

@@ -1,2 +1,7 @@
INCLUDE_DIRECTORIES(${GRASS_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
INCLUDE_DIRECTORIES(SYSTEM
${GRASS_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
)
ADD_GRASSPLUGIN(6)
@@ -39,9 +39,12 @@ ADD_LIBRARY (interpolationplugin MODULE
${INTERPOLATION_RCC_SRCS}
${INTERPOLATION_UIS_H})

INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
)

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${GEOS_INCLUDE_DIR}
../../analysis/interpolation
../../core
../../core/geometry
@@ -43,9 +43,13 @@ TARGET_LINK_LIBRARIES(offlineeditingplugin
${SPATIALITE_LIBRARY}
)

INCLUDE_DIRECTORIES(SYSTEM
${SPATIALITE_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
)

INCLUDE_DIRECTORIES(
${SPATIALITE_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
../../core
../../core/geometry
@@ -54,7 +58,6 @@ INCLUDE_DIRECTORIES(
../../gui
../../gui/layertree
..
${GEOS_INCLUDE_DIR}
)

########################################################
@@ -24,15 +24,18 @@ SET (VRP_MOC_HDRS
)
SET (VRP_RCCS roadgraph.qrc)

INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
)

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${GEOS_INCLUDE_DIR}
../../core
../../core/geometry
../../gui
../../analysis/network
..
)
)

########################################################
# Build
@@ -31,6 +31,10 @@ QT4_ADD_RESOURCES (SPATIALQUERY_RCC_SRCS ${SPATIALQUERY_RCCS})

ADD_LIBRARY (spatialqueryplugin MODULE ${SPATIALQUERY_SRCS} ${SPATIALQUERY_MOC_SRCS} ${SPATIALQUERY_RCC_SRCS} ${SPATIALQUERY_UIS_H})

INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
)

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../../ui/
@@ -39,7 +43,6 @@ INCLUDE_DIRECTORIES(
../../core/raster
../../gui
..
${GEOS_INCLUDE_DIR}
)

TARGET_LINK_LIBRARIES(spatialqueryplugin
@@ -37,10 +37,13 @@ QT4_ADD_RESOURCES(topol_RCC_SRCS ${topol_RCCS})

ADD_LIBRARY (topolplugin MODULE ${topol_SRCS} ${topol_MOC_SRCS} ${topol_RCC_SRCS} ${topol_UIS_H})

INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
)

INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}/src/ui
${CMAKE_CURRENT_BINARY_DIR}
${GEOS_INCLUDE_DIR}
../../core ../../core/geometry ../../core/raster
../../gui
..
@@ -1,4 +1,4 @@
INCLUDE_DIRECTORIES( SYSTEM
INCLUDE_DIRECTORIES(SYSTEM
${GRASS_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
@@ -7,13 +7,13 @@ INCLUDE_DIRECTORIES(
../../core/geometry
../../core/raster
../../gui
${CMAKE_CURRENT_BINARY_DIR}
)
INCLUDE_DIRECTORIES (SYSTEM
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${POSTGRES_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)

#
@@ -22,6 +22,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../../src/core/geometry
${CMAKE_CURRENT_SOURCE_DIR}/../../src/core/raster
${CMAKE_CURRENT_BINARY_DIR}
)
INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
)
@@ -15,11 +15,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src/analysis
${CMAKE_SOURCE_DIR}/src/analysis/vector
${CMAKE_SOURCE_DIR}/src/analysis/raster
)
INCLUDE_DIRECTORIES(SYSTEM
${QT_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
)
)

#############################################################
# Compiler defines
@@ -14,12 +14,14 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src/python
${CMAKE_SOURCE_DIR}/src/app
${CMAKE_SOURCE_DIR}/src/app/pluginmanager
)
INCLUDE_DIRECTORIES(SYSTEM
${QT_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${QCA_INCLUDE_DIR}
)
)

#############################################################
# Compiler defines
@@ -17,13 +17,15 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/geometry
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/raster
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/symbology-ng
)
INCLUDE_DIRECTORIES(SYSTEM
${QT_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${QWT_INCLUDE_DIR}
${QCA_INCLUDE_DIR}
)
)

#############################################################
# Compiler defines
@@ -9,12 +9,14 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src/core/auth
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/raster
)
INCLUDE_DIRECTORIES(SYSTEM
${QT_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${QCA_INCLUDE_DIR}
)
)

#############################################################
# Compiler defines
@@ -103,6 +105,8 @@ IF(UNIX AND NOT ANDROID AND CMAKE_BUILD_TYPE MATCHES Debug)
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/raster
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/providers/wcs
)
INCLUDE_DIRECTORIES(SYSTEM
${QT_QTSCRIPT_INCLUDE_DIR}
)

@@ -1,2 +1,3 @@
INCLUDE_DIRECTORIES(${GRASS_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
INCLUDE_DIRECTORIES(SYSTEM ${GRASS_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
ADD_QGIS_GRASS_TESTS(6)
@@ -2,6 +2,8 @@ ADD_DEFINITIONS("-DGRASS_EXPORT=${DLLIMPORT} -DGRASS_LIB_EXPORT=${DLLIMPORT}")

INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/providers/grass
)
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}

0 comments on commit 87c58f4

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