Skip to content

Commit

Permalink
Change some includes to system includes to avoid warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jan 7, 2016
1 parent 2ceeb94 commit a2a1b79
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
2 changes: 2 additions & 0 deletions src/analysis/network/CMakeLists.txt
Expand Up @@ -36,6 +36,8 @@ SET(QGIS_NETWORK_ANALYSIS_HDRS
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}../../core/
)
INCLUDE_DIRECTORIES(SYSTEM
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
Expand Down
8 changes: 5 additions & 3 deletions src/plugins/evis/CMakeLists.txt
Expand Up @@ -17,7 +17,7 @@ SET (evis_SRCS

)

SET (evis_UIS
SET (evis_UIS
ui/evisdatabaseconnectionguibase.ui
ui/evisdatabaselayerfieldselectionguibase.ui
ui/evisgenericeventbrowserguibase.ui
Expand All @@ -31,7 +31,7 @@ SET (evis_MOC_HDRS

eventbrowser/evisgenericeventbrowsergui.h
eventbrowser/evisimagedisplaywidget.h

idtool/eviseventidtool.h
)

Expand All @@ -48,10 +48,12 @@ QT4_ADD_RESOURCES(evis_RCC_SRCS ${evis_RCCS})

ADD_LIBRARY (evis MODULE ${evis_SRCS} ${evis_MOC_SRCS} ${evis_RCC_SRCS} ${evis_UIS_H})

INCLUDE_DIRECTORIES(
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${QT_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/databaseconnection
Expand Down
4 changes: 3 additions & 1 deletion src/plugins/grass/CMakeLists.txt
Expand Up @@ -163,11 +163,13 @@ INCLUDE_DIRECTORIES(
../../gui/layertree
../../providers/grass
${CMAKE_CURRENT_BINARY_DIR}/../../ui
qtermwidget
)
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${POSTGRES_INCLUDE_DIR}
qtermwidget
)


Expand Down
4 changes: 3 additions & 1 deletion src/plugins/zonal_statistics/CMakeLists.txt
Expand Up @@ -34,7 +34,6 @@ ADD_LIBRARY (zonalstatisticsplugin MODULE

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${GDAL_INCLUDE_DIR}
../../core
../../core/geometry
../../core/raster
Expand All @@ -43,6 +42,9 @@ INCLUDE_DIRECTORIES(
..
.
)
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
)

TARGET_LINK_LIBRARIES(zonalstatisticsplugin
qgis_analysis
Expand Down

0 comments on commit a2a1b79

Please sign in to comment.