Skip to content

Commit

Permalink
[cmake] remove of redundant includes (#40993)
Browse files Browse the repository at this point in the history
  • Loading branch information
@3nids
3nids committed Jan 13, 2021
1 parent 837db50 commit 23b50ab
Show file tree
Hide file tree
Showing 50 changed files with 0 additions and 99 deletions.
3 changes: 0 additions & 3 deletions python/CMakeLists.txt
View file
Expand Up @@ -99,8 +99,6 @@ endif()

include_directories(
${CMAKE_SOURCE_DIR}/src/plugins
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR} # qgsconfig.h, qgsversion.h
${CMAKE_BINARY_DIR}/src/core
Expand Down Expand Up @@ -234,7 +232,6 @@ if (WITH_SERVER AND WITH_SERVER_PLUGINS)
include_directories(
../src/server
${CMAKE_BINARY_DIR}/src/server
${CMAKE_SOURCE_DIR}/external
)

set(PY_MODULES ${PY_MODULES} server)
Expand Down
2 changes: 0 additions & 2 deletions src/3d/CMakeLists.txt
View file
Expand Up @@ -193,8 +193,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/mesh
${CMAKE_CURRENT_SOURCE_DIR}/symbols
${CMAKE_CURRENT_SOURCE_DIR}/terrain
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/3d
Expand Down
2 changes: 0 additions & 2 deletions src/app/CMakeLists.txt
View file
Expand Up @@ -415,7 +415,6 @@ endif()
include_directories(
${CMAKE_SOURCE_DIR}/external/libdxfrw
${CMAKE_SOURCE_DIR}/external/nmea
${CMAKE_SOURCE_DIR}/external

${CMAKE_SOURCE_DIR}/src/app
${CMAKE_SOURCE_DIR}/src/app/decorations
Expand Down Expand Up @@ -500,7 +499,6 @@ include_directories(
gps
dwg
${CMAKE_SOURCE_DIR}/external/libdxfrw
${CMAKE_SOURCE_DIR}/external/nlohmann
${CMAKE_SOURCE_DIR}/src/native

${CMAKE_BINARY_DIR}/src/native
Expand Down
1 change: 0 additions & 1 deletion src/core/CMakeLists.txt
View file
Expand Up @@ -1673,7 +1673,6 @@ if (WITH_EPT)
else()
# Use embedded laz-perf from external/laz-perf
include_directories(SYSTEM
${CMAKE_SOURCE_DIR}/external
)
endif()

Expand Down
1 change: 0 additions & 1 deletion src/crssync/CMakeLists.txt
View file
Expand Up @@ -3,7 +3,6 @@ add_executable(crssync main.cpp)
include_directories(
../core
../core/geometry
${CMAKE_SOURCE_DIR}/external
${CMAKE_BINARY_DIR}/src/core
)
include_directories(SYSTEM
Expand Down
2 changes: 0 additions & 2 deletions src/customwidgets/CMakeLists.txt
View file
Expand Up @@ -92,8 +92,6 @@ endif()

include_directories(
${CMAKE_BINARY_DIR}/src/customwidgets
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann
${CMAKE_CURRENT_BINARY_DIR}/../ui
)
include_directories(SYSTEM
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/geometry_checker/CMakeLists.txt
View file
Expand Up @@ -36,8 +36,6 @@ add_library (geometrycheckerplugin MODULE ${geometrychecker_HDRS} ${geometrych

include_directories(
${CMAKE_SOURCE_DIR}/src/plugins
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/gps_importer/CMakeLists.txt
View file
Expand Up @@ -26,8 +26,6 @@ add_library (gpsimporterplugin MODULE ${GPS_SRCS} ${GPS_RCCS} ${GPS_UIS_H})

include_directories(
${CMAKE_SOURCE_DIR}/src/plugins
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/grass/CMakeLists.txt
View file
Expand Up @@ -151,8 +151,6 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/plugins
${CMAKE_SOURCE_DIR}/src/app
${CMAKE_SOURCE_DIR}/src/providers/grass
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/offline_editing/CMakeLists.txt
View file
Expand Up @@ -39,8 +39,6 @@ include_directories(SYSTEM

include_directories(
${CMAKE_SOURCE_DIR}/src/plugins
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/topology/CMakeLists.txt
View file
Expand Up @@ -31,8 +31,6 @@ include_directories(SYSTEM

include_directories(
${CMAKE_SOURCE_DIR}/src/plugins
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
Expand Down
2 changes: 0 additions & 2 deletions src/process/CMakeLists.txt
View file
Expand Up @@ -37,8 +37,6 @@ endif()

include_directories(
${CMAKE_SOURCE_DIR}/src/python
${CMAKE_SOURCE_DIR}/external/nlohmann
${CMAKE_SOURCE_DIR}/external

${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/python
Expand Down
2 changes: 0 additions & 2 deletions src/providers/arcgisrest/CMakeLists.txt
View file
@@ -1,6 +1,4 @@
include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/ui
${CMAKE_BINARY_DIR}/src/core
Expand Down
2 changes: 0 additions & 2 deletions src/providers/db2/CMakeLists.txt
View file
Expand Up @@ -35,8 +35,6 @@ endif()

include_directories(
${CMAKE_SOURCE_DIR}/src/ui
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/gui
${CMAKE_BINARY_DIR}/src/ui
Expand Down
2 changes: 0 additions & 2 deletions src/providers/delimitedtext/CMakeLists.txt
View file
Expand Up @@ -19,8 +19,6 @@ endif()
# Build

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/gui
${CMAKE_BINARY_DIR}/src/ui
Expand Down
2 changes: 0 additions & 2 deletions src/providers/geonode/CMakeLists.txt
View file
Expand Up @@ -17,8 +17,6 @@ endif()
# Build

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/gui
${CMAKE_BINARY_DIR}/src/ui
Expand Down
2 changes: 0 additions & 2 deletions src/providers/gpx/CMakeLists.txt
View file
Expand Up @@ -12,8 +12,6 @@ set (GPX_SRCS
# Build

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
Expand Down
2 changes: 0 additions & 2 deletions src/providers/grass/CMakeLists.txt
View file
Expand Up @@ -3,8 +3,6 @@
# Build

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
Expand Down
2 changes: 0 additions & 2 deletions src/providers/hana/CMakeLists.txt
View file
Expand Up @@ -61,8 +61,6 @@ ENDIF ()
# Build

INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann
${CMAKE_SOURCE_DIR}/external/odbccpp/src

${CMAKE_BINARY_DIR}/src/core
Expand Down
2 changes: 0 additions & 2 deletions src/providers/mdal/CMakeLists.txt
View file
Expand Up @@ -169,8 +169,6 @@ endif()
########################################################

include_directories (
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/gui
${CMAKE_BINARY_DIR}/src/ui
Expand Down
2 changes: 0 additions & 2 deletions src/providers/mssql/CMakeLists.txt
View file
Expand Up @@ -27,8 +27,6 @@ set(MSSQL_HDRS
# Build

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
Expand Down
2 changes: 0 additions & 2 deletions src/providers/oracle/CMakeLists.txt
View file
Expand Up @@ -32,8 +32,6 @@ set(ORACLE_HDRS
# Build

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
Expand Down
2 changes: 0 additions & 2 deletions src/providers/ows/CMakeLists.txt
View file
Expand Up @@ -4,8 +4,6 @@ set(OWS_SRCS
)

include_directories (
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/gui
${CMAKE_BINARY_DIR}/src/ui
Expand Down
2 changes: 0 additions & 2 deletions src/providers/pdal/CMakeLists.txt
View file
Expand Up @@ -95,8 +95,6 @@ set(UNTWINE_INCLUDE_DIRS
# Build

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann
${CMAKE_SOURCE_DIR}/external/untwine/api

${CMAKE_BINARY_DIR}/src/core
Expand Down
2 changes: 0 additions & 2 deletions src/providers/postgres/CMakeLists.txt
View file
Expand Up @@ -35,8 +35,6 @@ set(PG_HDRS
# Build

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
Expand Down
3 changes: 0 additions & 3 deletions src/providers/spatialite/CMakeLists.txt
View file
Expand Up @@ -35,9 +35,6 @@ if (WITH_GUI)
endif()

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/gui
${CMAKE_BINARY_DIR}/src/ui
Expand Down
2 changes: 0 additions & 2 deletions src/providers/virtual/CMakeLists.txt
View file
Expand Up @@ -32,8 +32,6 @@ endif()
QT5_WRAP_UI(vlayer_provider_UI_H qgsvirtuallayersourceselectbase.ui qgsembeddedlayerselect.ui)

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
Expand Down
2 changes: 0 additions & 2 deletions src/providers/wcs/CMakeLists.txt
View file
Expand Up @@ -15,8 +15,6 @@ if (WITH_GUI)
endif()

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/gui
${CMAKE_BINARY_DIR}/src/ui
Expand Down
2 changes: 0 additions & 2 deletions src/providers/wfs/CMakeLists.txt
View file
Expand Up @@ -43,8 +43,6 @@ endif()
# Build

include_directories (
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/gui
${CMAKE_BINARY_DIR}/src/ui
Expand Down
2 changes: 0 additions & 2 deletions src/quickgui/CMakeLists.txt
View file
Expand Up @@ -52,8 +52,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/attributes
${CMAKE_CURRENT_BINARY_DIR}

${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/core
)
Expand Down
1 change: 0 additions & 1 deletion src/server/CMakeLists.txt
View file
Expand Up @@ -84,7 +84,6 @@ endif()


include_directories(
${CMAKE_SOURCE_DIR}/external
)

add_library(qgis_server SHARED ${QGIS_SERVER_SRCS} ${QGIS_SERVER_HDRS})
Expand Down
2 changes: 0 additions & 2 deletions src/server/services/DummyService/CMakeLists.txt
View file
Expand Up @@ -13,8 +13,6 @@ add_library (dummy MODULE ${dummy_SRCS})


include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann
${CMAKE_SOURCE_DIR}/src/server
${CMAKE_SOURCE_DIR}/src/server/services
${CMAKE_SOURCE_DIR}/src/server/services/DummeyService
Expand Down
2 changes: 0 additions & 2 deletions src/server/services/landingpage/CMakeLists.txt
View file
Expand Up @@ -18,8 +18,6 @@ include_directories(SYSTEM
)

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_SOURCE_DIR}/src/server
${CMAKE_SOURCE_DIR}/src/server/services
Expand Down
2 changes: 0 additions & 2 deletions src/server/services/wcs/CMakeLists.txt
View file
Expand Up @@ -22,8 +22,6 @@ include_directories(SYSTEM
)

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann
${CMAKE_SOURCE_DIR}/src/server
${CMAKE_SOURCE_DIR}/src/server/services
${CMAKE_SOURCE_DIR}/src/server/services/wcs
Expand Down
2 changes: 0 additions & 2 deletions src/server/services/wfs/CMakeLists.txt
View file
Expand Up @@ -30,8 +30,6 @@ include_directories(SYSTEM
)

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann
${CMAKE_SOURCE_DIR}/src/server
${CMAKE_SOURCE_DIR}/src/server/services
${CMAKE_SOURCE_DIR}/src/server/services/wfs
Expand Down
2 changes: 0 additions & 2 deletions src/server/services/wfs3/CMakeLists.txt
View file
Expand Up @@ -19,8 +19,6 @@ include_directories(SYSTEM
)

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_SOURCE_DIR}/src/server
${CMAKE_SOURCE_DIR}/src/server/services
Expand Down
2 changes: 0 additions & 2 deletions src/server/services/wms/CMakeLists.txt
View file
Expand Up @@ -40,8 +40,6 @@ include_directories(SYSTEM
)

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann
${CMAKE_SOURCE_DIR}/src/server
${CMAKE_SOURCE_DIR}/src/server/services
${CMAKE_SOURCE_DIR}/src/server/services/wms
Expand Down
2 changes: 0 additions & 2 deletions src/server/services/wmts/CMakeLists.txt
View file
Expand Up @@ -27,8 +27,6 @@ include_directories(SYSTEM
)

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_SOURCE_DIR}/src/server/
${CMAKE_SOURCE_DIR}/src/server/services
Expand Down
2 changes: 0 additions & 2 deletions tests/bench/CMakeLists.txt
View file
Expand Up @@ -12,8 +12,6 @@ set (BENCH_SRCS
add_executable (qgis_bench MACOSX_BUNDLE WIN32 ${BENCH_SRCS} )

include_directories(
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann


${CMAKE_BINARY_DIR}
Expand Down
2 changes: 0 additions & 2 deletions tests/src/3d/CMakeLists.txt
View file
Expand Up @@ -6,8 +6,6 @@ set (util_SRCS)
# Don't forget to include output directory, otherwise
# the UI file won't be wrapped!
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann
${CMAKE_SOURCE_DIR}/tests/core #for render checker class
${CMAKE_SOURCE_DIR}/src/3d
${CMAKE_SOURCE_DIR}/src/3d/chunks
Expand Down
2 changes: 0 additions & 2 deletions tests/src/3d/sandbox/CMakeLists.txt
View file
Expand Up @@ -3,8 +3,6 @@ if(WIN32)
endif()

include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann
${CMAKE_SOURCE_DIR}/tests/core #for render checker class
${CMAKE_SOURCE_DIR}/src/3d
${CMAKE_SOURCE_DIR}/src/3d/chunks
Expand Down
2 changes: 0 additions & 2 deletions tests/src/analysis/CMakeLists.txt
View file
Expand Up @@ -8,8 +8,6 @@ set (util_SRCS)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src/test
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann

${CMAKE_BINARY_DIR}/src/analysis
)
Expand Down
2 changes: 0 additions & 2 deletions tests/src/app/CMakeLists.txt
View file
Expand Up @@ -11,8 +11,6 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/app/mesh
${CMAKE_SOURCE_DIR}/src/app/pluginmanager
${CMAKE_SOURCE_DIR}/src/test
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/external/nlohmann
${CMAKE_SOURCE_DIR}/external/nmea

${CMAKE_BINARY_DIR}/src/analysis
Expand Down

0 comments on commit 23b50ab

Please sign in to comment.