Skip to content

Commit 87c58f4

Browse files
nyalldawsonnyalldawson
committed
Mark more includes as system includes
1 parent ae2738e commit 87c58f4

File tree

19 files changed

+63
-20
lines changed

19 files changed

+63
-20
lines changed

‎python/CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ IF(POLICY CMP0040)
6464
CMAKE_POLICY (POP) # see PUSH above
6565
ENDIF(POLICY CMP0040)
6666

67-
INCLUDE_DIRECTORIES(
67+
INCLUDE_DIRECTORIES(SYSTEM
6868
${PYTHON_INCLUDE_PATH}
6969
${SIP_INCLUDE_DIR}
7070
${QT_QTCORE_INCLUDE_DIR}
@@ -78,7 +78,8 @@ INCLUDE_DIRECTORIES(
7878
${QEXTSERIALPORT_INCLUDE_DIR}
7979
${QSCINTILLA_INCLUDE_DIR}
8080
${QCA_INCLUDE_DIR}
81-
81+
)
82+
INCLUDE_DIRECTORIES(
8283
../src/core
8384
../src/core/auth
8485
../src/core/pal

‎src/plugins/coordinate_capture/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ INCLUDE_DIRECTORIES(
3535
../../core/raster
3636
../../gui
3737
..
38+
)
39+
INCLUDE_DIRECTORIES(SYSTEM
3840
${GEOS_INCLUDE_DIR}
3941
)
4042

‎src/plugins/globe/CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,14 @@ QT4_ADD_RESOURCES(globe_plugin_RCC_SRCS ${globe_plugin_RCCS})
5454

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

57-
INCLUDE_DIRECTORIES(
58-
${CMAKE_CURRENT_BINARY_DIR}
57+
INCLUDE_DIRECTORIES(SYSTEM
5958
${OSGEARTH_INCLUDE_DIR}
6059
${OSG_INCLUDE_DIR}
6160
${GEOS_INCLUDE_DIR}
61+
)
62+
63+
INCLUDE_DIRECTORIES(
64+
${CMAKE_CURRENT_BINARY_DIR}
6265
../../core ../../core/geometry ../../core/raster
6366
../../gui
6467
..

‎src/plugins/gps_importer/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ INCLUDE_DIRECTORIES(
4343
../../core/gps
4444
../../gui
4545
..
46+
)
47+
INCLUDE_DIRECTORIES(SYSTEM
4648
${EXPAT_INCLUDE_DIR}
4749
)
4850

‎src/plugins/grass/6/CMakeLists.txt

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1-
INCLUDE_DIRECTORIES(${GRASS_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
1+
INCLUDE_DIRECTORIES(SYSTEM
2+
${GRASS_INCLUDE_DIR}
3+
)
4+
INCLUDE_DIRECTORIES(
5+
${CMAKE_CURRENT_BINARY_DIR}
6+
)
27
ADD_GRASSPLUGIN(6)

‎src/plugins/interpolation/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,12 @@ ADD_LIBRARY (interpolationplugin MODULE
3939
${INTERPOLATION_RCC_SRCS}
4040
${INTERPOLATION_UIS_H})
4141

42+
INCLUDE_DIRECTORIES(SYSTEM
43+
${GEOS_INCLUDE_DIR}
44+
)
45+
4246
INCLUDE_DIRECTORIES(
4347
${CMAKE_CURRENT_BINARY_DIR}
44-
${GEOS_INCLUDE_DIR}
4548
../../analysis/interpolation
4649
../../core
4750
../../core/geometry

‎src/plugins/offline_editing/CMakeLists.txt

+6-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,13 @@ TARGET_LINK_LIBRARIES(offlineeditingplugin
4343
${SPATIALITE_LIBRARY}
4444
)
4545

46+
INCLUDE_DIRECTORIES(SYSTEM
47+
${SPATIALITE_INCLUDE_DIR}
48+
${SQLITE3_INCLUDE_DIR}
49+
${GEOS_INCLUDE_DIR}
50+
)
51+
4652
INCLUDE_DIRECTORIES(
47-
${SPATIALITE_INCLUDE_DIR}
48-
${SQLITE3_INCLUDE_DIR}
4953
${CMAKE_CURRENT_BINARY_DIR}
5054
../../core
5155
../../core/geometry
@@ -54,7 +58,6 @@ INCLUDE_DIRECTORIES(
5458
../../gui
5559
../../gui/layertree
5660
..
57-
${GEOS_INCLUDE_DIR}
5861
)
5962

6063
########################################################

‎src/plugins/roadgraph/CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,18 @@ SET (VRP_MOC_HDRS
2424
)
2525
SET (VRP_RCCS roadgraph.qrc)
2626

27+
INCLUDE_DIRECTORIES(SYSTEM
28+
${GEOS_INCLUDE_DIR}
29+
)
30+
2731
INCLUDE_DIRECTORIES(
2832
${CMAKE_CURRENT_BINARY_DIR}
29-
${GEOS_INCLUDE_DIR}
3033
../../core
3134
../../core/geometry
3235
../../gui
3336
../../analysis/network
3437
..
35-
)
38+
)
3639

3740
########################################################
3841
# Build

‎src/plugins/spatialquery/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ QT4_ADD_RESOURCES (SPATIALQUERY_RCC_SRCS ${SPATIALQUERY_RCCS})
3131

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

34+
INCLUDE_DIRECTORIES(SYSTEM
35+
${GEOS_INCLUDE_DIR}
36+
)
37+
3438
INCLUDE_DIRECTORIES(
3539
${CMAKE_CURRENT_BINARY_DIR}
3640
${CMAKE_CURRENT_BINARY_DIR}/../../ui/
@@ -39,7 +43,6 @@ INCLUDE_DIRECTORIES(
3943
../../core/raster
4044
../../gui
4145
..
42-
${GEOS_INCLUDE_DIR}
4346
)
4447

4548
TARGET_LINK_LIBRARIES(spatialqueryplugin

‎src/plugins/topology/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,13 @@ QT4_ADD_RESOURCES(topol_RCC_SRCS ${topol_RCCS})
3737

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

40+
INCLUDE_DIRECTORIES(SYSTEM
41+
${GEOS_INCLUDE_DIR}
42+
)
43+
4044
INCLUDE_DIRECTORIES(
4145
${CMAKE_BINARY_DIR}/src/ui
4246
${CMAKE_CURRENT_BINARY_DIR}
43-
${GEOS_INCLUDE_DIR}
4447
../../core ../../core/geometry ../../core/raster
4548
../../gui
4649
..

‎src/providers/grass/6/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
INCLUDE_DIRECTORIES( SYSTEM
1+
INCLUDE_DIRECTORIES(SYSTEM
22
${GRASS_INCLUDE_DIR}
33
)
44
INCLUDE_DIRECTORIES(

‎src/providers/grass/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ INCLUDE_DIRECTORIES(
77
../../core/geometry
88
../../core/raster
99
../../gui
10+
${CMAKE_CURRENT_BINARY_DIR}
1011
)
1112
INCLUDE_DIRECTORIES (SYSTEM
1213
${GDAL_INCLUDE_DIR}
1314
${PROJ_INCLUDE_DIR}
1415
${GEOS_INCLUDE_DIR}
1516
${POSTGRES_INCLUDE_DIR}
16-
${CMAKE_CURRENT_BINARY_DIR}
1717
)
1818

1919
#

‎tests/bench/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
2222
${CMAKE_CURRENT_SOURCE_DIR}/../../src/core/geometry
2323
${CMAKE_CURRENT_SOURCE_DIR}/../../src/core/raster
2424
${CMAKE_CURRENT_BINARY_DIR}
25+
)
26+
INCLUDE_DIRECTORIES(SYSTEM
2527
${GEOS_INCLUDE_DIR}
2628
${SQLITE3_INCLUDE_DIR}
2729
)

‎tests/src/analysis/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
1515
${CMAKE_SOURCE_DIR}/src/analysis
1616
${CMAKE_SOURCE_DIR}/src/analysis/vector
1717
${CMAKE_SOURCE_DIR}/src/analysis/raster
18+
)
19+
INCLUDE_DIRECTORIES(SYSTEM
1820
${QT_INCLUDE_DIR}
1921
${GDAL_INCLUDE_DIR}
2022
${PROJ_INCLUDE_DIR}
2123
${GEOS_INCLUDE_DIR}
22-
)
24+
)
2325

2426
#############################################################
2527
# Compiler defines

‎tests/src/app/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
1414
${CMAKE_SOURCE_DIR}/src/python
1515
${CMAKE_SOURCE_DIR}/src/app
1616
${CMAKE_SOURCE_DIR}/src/app/pluginmanager
17+
)
18+
INCLUDE_DIRECTORIES(SYSTEM
1719
${QT_INCLUDE_DIR}
1820
${GDAL_INCLUDE_DIR}
1921
${PROJ_INCLUDE_DIR}
2022
${GEOS_INCLUDE_DIR}
2123
${QCA_INCLUDE_DIR}
22-
)
24+
)
2325

2426
#############################################################
2527
# Compiler defines

‎tests/src/gui/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
1717
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/geometry
1818
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/raster
1919
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/symbology-ng
20+
)
21+
INCLUDE_DIRECTORIES(SYSTEM
2022
${QT_INCLUDE_DIR}
2123
${GDAL_INCLUDE_DIR}
2224
${PROJ_INCLUDE_DIR}
2325
${GEOS_INCLUDE_DIR}
2426
${QWT_INCLUDE_DIR}
2527
${QCA_INCLUDE_DIR}
26-
)
28+
)
2729

2830
#############################################################
2931
# Compiler defines

‎tests/src/providers/CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
99
${CMAKE_SOURCE_DIR}/src/core/auth
1010
${CMAKE_SOURCE_DIR}/src/core/geometry
1111
${CMAKE_SOURCE_DIR}/src/core/raster
12+
)
13+
INCLUDE_DIRECTORIES(SYSTEM
1214
${QT_INCLUDE_DIR}
1315
${GDAL_INCLUDE_DIR}
1416
${PROJ_INCLUDE_DIR}
1517
${GEOS_INCLUDE_DIR}
1618
${QCA_INCLUDE_DIR}
17-
)
19+
)
1820

1921
#############################################################
2022
# Compiler defines
@@ -103,6 +105,8 @@ IF(UNIX AND NOT ANDROID AND CMAKE_BUILD_TYPE MATCHES Debug)
103105
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core
104106
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/raster
105107
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/providers/wcs
108+
)
109+
INCLUDE_DIRECTORIES(SYSTEM
106110
${QT_QTSCRIPT_INCLUDE_DIR}
107111
)
108112

‎tests/src/providers/grass/6/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
INCLUDE_DIRECTORIES(${GRASS_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
1+
INCLUDE_DIRECTORIES(SYSTEM ${GRASS_INCLUDE_DIR})
2+
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
23
ADD_QGIS_GRASS_TESTS(6)

‎tests/src/providers/grass/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ ADD_DEFINITIONS("-DGRASS_EXPORT=${DLLIMPORT} -DGRASS_LIB_EXPORT=${DLLIMPORT}")
22

33
INCLUDE_DIRECTORIES(
44
${CMAKE_SOURCE_DIR}/src/providers/grass
5+
)
6+
INCLUDE_DIRECTORIES(SYSTEM
57
${GDAL_INCLUDE_DIR}
68
${PROJ_INCLUDE_DIR}
79
${GEOS_INCLUDE_DIR}

0 commit comments

Comments
 (0)