Skip to content
Permalink
Browse files

Mark system includes as such in CMakeLists

Avoids compiler warnings from linked system headers
  • Loading branch information
nyalldawson committed Oct 19, 2015
1 parent 9319176 commit 46f073086f987b70eb9c7b8166d1581d8367caca
@@ -54,8 +54,8 @@ SET(QGIS_ANALYSIS_MOC_HDRS
openstreetmap/qgsosmimport.h
)

INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
INCLUDE_DIRECTORIES(SYSTEM ${SPATIALITE_INCLUDE_DIR})
INCLUDE_DIRECTORIES(SYSTEM ${SQLITE3_INCLUDE_DIR})
INCLUDE_DIRECTORIES(BEFORE raster)

ADD_FLEX_FILES_PREFIX(QGIS_ANALYSIS_SRCS raster raster/qgsrastercalclexer.ll)
@@ -136,6 +136,8 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/../core/raster
${CMAKE_CURRENT_SOURCE_DIR}/../core/symbology-ng
interpolation
)
INCLUDE_DIRECTORIES(SYSTEM
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
@@ -466,10 +466,14 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR} composer legend pluginmanager
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../ui
)
INCLUDE_DIRECTORIES(SYSTEM
${QWT_INCLUDE_DIR}
${QT_QTUITOOLS_INCLUDE_DIR}
${QSCINTILLA_INCLUDE_DIR}
${QEXTSERIALPORT_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
../analysis/raster
../analysis/openstreetmap
../core
@@ -493,6 +497,8 @@ INCLUDE_DIRECTORIES(
../python
gps
openstreetmap
)
INCLUDE_DIRECTORIES(SYSTEM
${SPATIALITE_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
@@ -19,7 +19,11 @@ INCLUDE_DIRECTORIES (
../../core
../../core/auth
../../core/geometry
)
INCLUDE_DIRECTORIES (SYSTEM
${QCA_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES (
../../gui
../../gui/auth
${CMAKE_CURRENT_BINARY_DIR}
@@ -19,7 +19,11 @@ INCLUDE_DIRECTORIES (
../../core
../../core/auth
../../core/geometry
)
INCLUDE_DIRECTORIES (SYSTEM
${QCA_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES (
../../gui
../../gui/auth
${CMAKE_CURRENT_BINARY_DIR}
@@ -19,7 +19,11 @@ INCLUDE_DIRECTORIES (
../../core
../../core/auth
../../core/geometry
)
INCLUDE_DIRECTORIES (SYSTEM
${QCA_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES (
../../gui
../../gui/auth
${CMAKE_CURRENT_BINARY_DIR}
@@ -19,7 +19,11 @@ INCLUDE_DIRECTORIES (
../../core
../../core/auth
../../core/geometry
)
INCLUDE_DIRECTORIES (SYSTEM
${QCA_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES (
../../gui
../../gui/auth
${CMAKE_CURRENT_BINARY_DIR}
@@ -65,12 +65,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../gui/editorwidgets/core
${CMAKE_CURRENT_BINARY_DIR}/../ui
${CMAKE_CURRENT_BINARY_DIR}
)
INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR} # remove once raster layer is cleaned up
${SQLITE3_INCLUDE_DIR}
)

INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})

TARGET_LINK_LIBRARIES(qbrowser
qgis_core
qgis_gui
@@ -776,6 +776,8 @@ INCLUDE_DIRECTORIES(
renderer
symbology-ng
gps/qextserialport
)
INCLUDE_DIRECTORIES(SYSTEM
${SPATIALINDEX_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
@@ -3,6 +3,8 @@ ADD_EXECUTABLE(crssync main.cpp)
INCLUDE_DIRECTORIES(
../core
../core/geometry
)
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
)
@@ -103,6 +103,8 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/../gui/attributetable/
${CMAKE_CURRENT_SOURCE_DIR}/../gui/editorwidgets/
${CMAKE_CURRENT_BINARY_DIR}/../ui/
)
INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
${Qt5Designer_INCLUDE_DIRS} # For Qt5
${QT_QTDESIGNER_INCLUDE_DIR} # For Qt4
@@ -638,8 +638,10 @@ IF(ENABLE_MODELTEST)
INCLUDE_DIRECTORIES(../../tests/qt_modeltest)
ENDIF(ENABLE_MODELTEST)

INCLUDE_DIRECTORIES(
INCLUDE_DIRECTORIES(SYSTEM
${QT_QTUITOOLS_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/symbology-ng
${CMAKE_CURRENT_SOURCE_DIR}/attributetable
@@ -658,15 +660,16 @@ INCLUDE_DIRECTORIES(
../core/effects
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../ui
)
INCLUDE_DIRECTORIES(SYSTEM
${QCA_INCLUDE_DIR}
${QWT_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
${QSCINTILLA_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
)

INCLUDE_DIRECTORIES(${QSCINTILLA_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${GEOS_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR})

IF (NOT MSVC)
ADD_DEFINITIONS("-UGUI_EXPORT")
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
@@ -56,6 +56,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../core
${CMAKE_CURRENT_SOURCE_DIR}/../core/geometry
${CMAKE_CURRENT_BINARY_DIR}
)
INCLUDE_DIRECTORIES(SYSTEM
${SQLITE3_INCLUDE_DIR}
)

@@ -27,10 +27,12 @@ QT4_ADD_RESOURCES(heatmap_RCC_SRCS ${heatmap_RCCS})

ADD_LIBRARY (heatmapplugin MODULE ${heatmap_SRCS} ${heatmap_MOC_SRCS} ${heatmap_RCC_SRCS} ${heatmap_UIS_H})

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
INCLUDE_DIRECTORIES( SYSTEM
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
../../core
../../core/geometry
../../core/raster
@@ -37,6 +37,8 @@ INCLUDE_DIRECTORIES(
../../core ../../core/geometry ../../core/raster
../../gui
..
)
INCLUDE_DIRECTORIES( SYSTEM
${GDAL_INCLUDE_DIR}
)

@@ -62,6 +62,8 @@ INCLUDE_DIRECTORIES(
../../app
../../providers/postgres
..
)
INCLUDE_DIRECTORIES(SYSTEM
${POSTGRES_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${QCA_INCLUDE_DIR}
@@ -22,7 +22,11 @@ INCLUDE_DIRECTORIES(
../../core
../../core/geometry
../../gui
)
INCLUDE_DIRECTORIES (SYSTEM
${GEOS_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES (
${CMAKE_CURRENT_BINARY_DIR}/../../ui
)

@@ -13,6 +13,8 @@ INCLUDE_DIRECTORIES (
../../core/geometry
../../gui
${CMAKE_CURRENT_BINARY_DIR}/../../ui
)
INCLUDE_DIRECTORIES (SYSTEM
${GDAL_INCLUDE_DIR}
# ${PROJ_INCLUDE_DIR}
# ${GEOS_INCLUDE_DIR}
@@ -18,6 +18,8 @@ SET (GPX_MOC_HDRS
INCLUDE_DIRECTORIES(
../../core
../../core/geometry
)
INCLUDE_DIRECTORIES (SYSTEM
${GEOS_INCLUDE_DIR}
${EXPAT_INCLUDE_DIR}
)
@@ -1,5 +1,7 @@
INCLUDE_DIRECTORIES(
INCLUDE_DIRECTORIES( SYSTEM
${GRASS_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
)
ADD_GRASSLIB(6)
@@ -1,5 +1,7 @@
INCLUDE_DIRECTORIES(
INCLUDE_DIRECTORIES( SYSTEM
${GRASS_INCLUDE_DIR7}
)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
)
ADD_GRASSLIB(7)
@@ -7,6 +7,8 @@ INCLUDE_DIRECTORIES(
../../core/geometry
../../core/raster
../../gui
)
INCLUDE_DIRECTORIES (SYSTEM
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
@@ -5,6 +5,8 @@ INCLUDE_DIRECTORIES(
.
../../core
../../core/geometry
)
INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
)

@@ -10,10 +10,14 @@ INCLUDE_DIRECTORIES(
.
../../core
../../core/geometry
)
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${QT_INCLUDE_DIR}
${QSCINTILLA_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
../../gui
${CMAKE_CURRENT_BINARY_DIR}/../../ui
)
@@ -13,6 +13,8 @@ INCLUDE_DIRECTORIES(
../../core
../../core/geometry
${CMAKE_CURRENT_SOURCE_DIR}/../../core/symbology-ng
)
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
)
@@ -35,8 +35,14 @@ INCLUDE_DIRECTORIES(
../../core
../../core/geometry
../../gui
)
INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}/../../ui
)
INCLUDE_DIRECTORIES(SYSTEM
${QT_QTSQL_INCLUDEDIR}
${QSCINTILLA_INCLUDE_DIR}
)
@@ -9,7 +9,7 @@ ADD_DEFINITIONS(-DQT_PLUGIN)
ADD_DEFINITIONS(-DQT_NO_DEBUG)
ADD_DEFINITIONS(-DQT_SHARED)

INCLUDE_DIRECTORIES(${OCI_INCLUDE_DIR})
INCLUDE_DIRECTORIES(SYSTEM ${OCI_INCLUDE_DIR})

SET(QSQLOCISPATIAL_SRC qsql_ocispatial.cpp main.cpp)
QT4_WRAP_CPP(QSQLOCISPATIAL_SRC qsql_ocispatial.h)
@@ -40,10 +40,14 @@ INCLUDE_DIRECTORIES(
../../core
../../core/auth
../../core/geometry
)
INCLUDE_DIRECTORIES(SYSTEM
${POSTGRES_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${QSCINTILLA_INCLUDE_DIR}
${QCA_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
../../core
../../gui
../../gui/auth
@@ -30,12 +30,16 @@ SET(SPATIALITE_MOC_HDRS

QT4_WRAP_CPP(SPATIALITE_MOC_SRCS ${SPATIALITE_MOC_HDRS})

INCLUDE_DIRECTORIES(
INCLUDE_DIRECTORIES(SYSTEM
${QSCINTILLA_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
../../core
../../core/geometry
../../gui
${CMAKE_CURRENT_BINARY_DIR}/../../ui
)
INCLUDE_DIRECTORIES(SYSTEM
${SPATIALITE_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
)
@@ -6,7 +6,7 @@ ADD_DEFINITIONS(-DQT_PLUGIN)
ADD_DEFINITIONS(-DQT_NO_DEBUG)
ADD_DEFINITIONS(-DQT_SHARED)

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

SET(QSQLSPATIALITE_SRC qsql_spatialite.cpp smain.cpp)
QT4_WRAP_CPP(QSQLSPATIALITE_SRC qsql_spatialite.h)
@@ -26,6 +26,8 @@ INCLUDE_DIRECTORIES(
../../gui/auth
../gdal
${CMAKE_CURRENT_BINARY_DIR}/../../ui
)
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
${QCA_INCLUDE_DIR}
)
@@ -30,6 +30,8 @@ INCLUDE_DIRECTORIES (
../../gui
../../gui/auth
${CMAKE_CURRENT_BINARY_DIR}/../../ui
)
INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}/geos
${EXPAT_INCLUDE_DIR}
@@ -33,6 +33,8 @@ INCLUDE_DIRECTORIES(
../../gui
../../gui/auth
${CMAKE_CURRENT_BINARY_DIR}/../../ui
)
INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${QT_QTSCRIPT_INCLUDE_DIR}

0 comments on commit 46f0730

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