Skip to content

Commit 8245558

Browse files
m-kuhnm-kuhn
committedMay 19, 2017
General include cleanup
This unifies the way the include directories are handled in the CMakeLists.txt files. Paths are now normally relative to the root of the source- or build dir. They may still be relative for paths withing a plugin subdirectory but should no longer be relative to paths outside of the current source- or build-directory. The previous approach had resultet in many different styles which are hard to wrap ones head around if new to the build system. It sometimes defined includes twice By using relative paths, it was not possible to copy paste the paths between different files.
·
ltr-3_40final-3_0_0
1 parent ec40199 commit 8245558

40 files changed

+374
-325
lines changed
 

‎python/CMakeLists.txt

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -93,38 +93,37 @@ INCLUDE_DIRECTORIES(SYSTEM
9393
${SQLITE3_INCLUDE_DIR}
9494
)
9595
INCLUDE_DIRECTORIES(
96-
../src/core
97-
../src/core/annotations
98-
../src/core/auth
99-
../src/core/pal
100-
../src/core/composer
101-
../src/core/diagram
102-
../src/core/effects
103-
../src/core/fieldformatter
104-
../src/core/dxf
105-
../src/core/geometry
106-
../src/core/gps
107-
../src/core/layertree
108-
../src/core/metadata
109-
../src/core/processing
110-
../src/core/providers
111-
../src/core/providers/memory
112-
../src/core/raster
113-
../src/core/scalebar
114-
../src/core/symbology-ng
115-
116-
../src/gui
117-
../src/gui/symbology-ng
118-
../src/gui/raster
119-
../src/gui/attributetable
120-
../src/gui/auth
121-
../src/gui/editorwidgets
122-
../src/gui/editorwidgets/core
123-
../src/gui/effects
124-
../src/gui/layertree
125-
../src/gui/locator
126-
127-
../src/plugins
96+
${CMAKE_SOURCE_DIR}/src/core
97+
${CMAKE_SOURCE_DIR}/src/core/annotations
98+
${CMAKE_SOURCE_DIR}/src/core/auth
99+
${CMAKE_SOURCE_DIR}/src/core/expression
100+
${CMAKE_SOURCE_DIR}/src/core/pal
101+
${CMAKE_SOURCE_DIR}/src/core/composer
102+
${CMAKE_SOURCE_DIR}/src/core/diagram
103+
${CMAKE_SOURCE_DIR}/src/core/effects
104+
${CMAKE_SOURCE_DIR}/src/core/fieldformatter
105+
${CMAKE_SOURCE_DIR}/src/core/dxf
106+
${CMAKE_SOURCE_DIR}/src/core/geometry
107+
${CMAKE_SOURCE_DIR}/src/core/gps
108+
${CMAKE_SOURCE_DIR}/src/core/layertree
109+
${CMAKE_SOURCE_DIR}/src/core/locator
110+
${CMAKE_SOURCE_DIR}/src/core/metadata
111+
${CMAKE_SOURCE_DIR}/src/core/processing
112+
${CMAKE_SOURCE_DIR}/src/core/providers
113+
${CMAKE_SOURCE_DIR}/src/core/providers/memory
114+
${CMAKE_SOURCE_DIR}/src/core/raster
115+
${CMAKE_SOURCE_DIR}/src/core/scalebar
116+
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
117+
${CMAKE_SOURCE_DIR}/src/gui
118+
${CMAKE_SOURCE_DIR}/src/gui/symbology-ng
119+
${CMAKE_SOURCE_DIR}/src/gui/raster
120+
${CMAKE_SOURCE_DIR}/src/gui/attributetable
121+
${CMAKE_SOURCE_DIR}/src/gui/auth
122+
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
123+
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
124+
${CMAKE_SOURCE_DIR}/src/gui/effects
125+
${CMAKE_SOURCE_DIR}/src/gui/layertree
126+
${CMAKE_SOURCE_DIR}/src/plugins
128127

129128
${CMAKE_BINARY_DIR} # qgsconfig.h, qgsversion.h
130129
${CMAKE_BINARY_DIR}/src/core

‎src/app/CMakeLists.txt

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -478,57 +478,56 @@ IF(PEDANTIC)
478478
ENDIF(PEDANTIC)
479479

480480
INCLUDE_DIRECTORIES(
481-
${CMAKE_CURRENT_SOURCE_DIR} composer legend pluginmanager
482-
${CMAKE_CURRENT_BINARY_DIR}
483-
${CMAKE_CURRENT_BINARY_DIR}/../ui
481+
${CMAKE_SOURCE_DIR}/src/app
482+
${CMAKE_SOURCE_DIR}/src/app/composer
483+
${CMAKE_SOURCE_DIR}/src/app/pluginmanager
484+
${CMAKE_SOURCE_DIR}/src/app/gps
485+
${CMAKE_SOURCE_DIR}/src/app/openstreetmap
486+
${CMAKE_SOURCE_DIR}/src/app/dwg
487+
${CMAKE_SOURCE_DIR}/src/app/dwg/libdxfrw
488+
${CMAKE_SOURCE_DIR}/src/analysis/raster
489+
${CMAKE_SOURCE_DIR}/src/analysis/openstreetmap
490+
${CMAKE_SOURCE_DIR}/src/core
491+
${CMAKE_SOURCE_DIR}/src/core/annotations
492+
${CMAKE_SOURCE_DIR}/src/core/auth
493+
${CMAKE_SOURCE_DIR}/src/core/expression
494+
${CMAKE_SOURCE_DIR}/src/core/gps
495+
${CMAKE_SOURCE_DIR}/src/core/composer
496+
${CMAKE_SOURCE_DIR}/src/core/dxf
497+
${CMAKE_SOURCE_DIR}/src/core/geometry
498+
${CMAKE_SOURCE_DIR}/src/core/metadata
499+
${CMAKE_SOURCE_DIR}/src/core/layertree
500+
${CMAKE_SOURCE_DIR}/src/core/locator
501+
${CMAKE_SOURCE_DIR}/src/core/providers/memory
502+
${CMAKE_SOURCE_DIR}/src/core/raster
503+
${CMAKE_SOURCE_DIR}/src/core/scalebar
504+
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
505+
${CMAKE_SOURCE_DIR}/src/gui
506+
${CMAKE_SOURCE_DIR}/src/gui/symbology-ng
507+
${CMAKE_SOURCE_DIR}/src/gui/attributetable
508+
${CMAKE_SOURCE_DIR}/src/gui/auth
509+
${CMAKE_SOURCE_DIR}/src/gui/raster
510+
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
511+
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
512+
${CMAKE_SOURCE_DIR}/src/gui/layertree
513+
${CMAKE_SOURCE_DIR}/src/plugins
514+
${CMAKE_SOURCE_DIR}/src/python
515+
${CMAKE_SOURCE_DIR}/src/native
516+
484517
${CMAKE_BINARY_DIR}/src/core
485518
${CMAKE_BINARY_DIR}/src/gui
486519
${CMAKE_BINARY_DIR}/src/python
487520
${CMAKE_BINARY_DIR}/src/analysis
488521
${CMAKE_BINARY_DIR}/src/app
522+
${CMAKE_BINARY_DIR}/src/ui
523+
${CMAKE_BINARY_DIR}/src/native
489524
)
525+
490526
INCLUDE_DIRECTORIES(SYSTEM
491527
${QWT_INCLUDE_DIR}
492528
${QT_QTUITOOLS_INCLUDE_DIR}
493529
${QSCINTILLA_INCLUDE_DIR}
494530
${QEXTSERIALPORT_INCLUDE_DIR}
495-
)
496-
INCLUDE_DIRECTORIES(
497-
../analysis/raster
498-
../analysis/openstreetmap
499-
../core
500-
../core/annotations
501-
../core/auth
502-
../core/gps
503-
../core/composer
504-
../core/dxf
505-
../core/geometry
506-
../core/metadata
507-
../core/layertree
508-
../core/providers/memory
509-
../core/raster
510-
../core/scalebar
511-
../core/symbology-ng
512-
../gui
513-
../gui/symbology-ng
514-
../gui/attributetable
515-
../gui/auth
516-
../gui/locator
517-
../gui/raster
518-
../gui/editorwidgets
519-
../gui/editorwidgets/core
520-
../gui/layertree
521-
../plugins
522-
../python
523-
gps
524-
openstreetmap
525-
dwg
526-
dwg/libdxfrw
527-
locator
528-
${CMAKE_SOURCE_DIR}/src/native
529-
${CMAKE_BINARY_DIR}/src/native
530-
)
531-
INCLUDE_DIRECTORIES(SYSTEM
532531
${SPATIALITE_INCLUDE_DIR}
533532
${SQLITE3_INCLUDE_DIR}
534533
${PROJ_INCLUDE_DIR}

‎src/core/composer/qgscomposermapitem.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,18 @@ class CORE_EXPORT QgsComposerMapItem : public QgsComposerObject
9191
* \param enabled set to true to enable drawing of the item
9292
* \see enabled
9393
*/
94-
virtual void setEnabled( const bool enabled ) { mEnabled = enabled; }
94+
virtual void setEnabled( const bool enabled );
9595

9696
/** Returns whether the item will be drawn
9797
* \returns true if item will be drawn on the map
9898
* \see setEnabled
9999
*/
100-
virtual bool enabled() const { return mEnabled; }
100+
virtual bool enabled() const;
101101

102102
/** Returns true if the item is drawn using advanced effects, such as blend modes.
103103
* \returns true if item uses advanced effects
104104
*/
105-
virtual bool usesAdvancedEffects() const { return false; }
105+
virtual bool usesAdvancedEffects() const;
106106

107107
protected:
108108

‎src/core/qgssqlexpressioncompiler.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "qgssqlexpressioncompiler.h"
1717
#include "qgsexpressionnodeimpl.h"
1818
#include "qgsexpressionfunction.h"
19+
#include "qgsexpression.h"
1920

2021
QgsSqlExpressionCompiler::QgsSqlExpressionCompiler( const QgsFields &fields, Flags flags )
2122
: mResult( None )

‎src/core/qgssqlexpressioncompiler.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717
#define QGSSQLEXPRESSIONCOMPILER_H
1818

1919
#include "qgis_core.h"
20-
#include "qgsexpression.h"
2120
#include "qgsfields.h"
2221

22+
class QgsExpression;
23+
class QgsExpressionNode;
24+
2325
/** \ingroup core
2426
* \class QgsSqlExpressionCompiler
2527
* \brief Generic expression compiler for translation to provider specific SQL WHERE clauses.

‎src/plugins/coordinate_capture/CMakeLists.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,20 @@ QT5_ADD_RESOURCES(coordinatecapture_RCC_SRCS ${coordinatecapture_RCCS})
2828
ADD_LIBRARY (coordinatecaptureplugin MODULE ${coordinatecapture_SRCS} ${coordinatecapture_MOC_SRCS} ${coordinatecapture_RCC_SRCS})
2929

3030
INCLUDE_DIRECTORIES(
31-
${CMAKE_CURRENT_BINARY_DIR}
32-
${CMAKE_CURRENT_BINARY_DIR}/../../ui/
33-
../../core
34-
../../core/geometry
35-
../../core/metadata
36-
../../core/raster
37-
../../gui
38-
..
31+
${CMAKE_SOURCE_DIR}/src/core
32+
${CMAKE_SOURCE_DIR}/src/core/expression
33+
${CMAKE_SOURCE_DIR}/src/core/geometry
34+
${CMAKE_SOURCE_DIR}/src/core/metadata
35+
${CMAKE_SOURCE_DIR}/src/core/raster
36+
${CMAKE_SOURCE_DIR}/src/gui
37+
${CMAKE_SOURCE_DIR}/src/plugins
38+
3939
${CMAKE_BINARY_DIR}/src/core
4040
${CMAKE_BINARY_DIR}/src/gui
41+
${CMAKE_BINARY_DIR}/src/ui
4142
)
4243
INCLUDE_DIRECTORIES(SYSTEM
43-
${GEOS_INCLUDE_DIR}
44+
${GEOS_INCLUDE_DIR}
4445
)
4546

4647
TARGET_LINK_LIBRARIES(coordinatecaptureplugin

‎src/plugins/evis/CMakeLists.txt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,21 @@ INCLUDE_DIRECTORIES(SYSTEM
5454
${QT_INCLUDE_DIR}
5555
)
5656
INCLUDE_DIRECTORIES(
57-
${CMAKE_CURRENT_SOURCE_DIR}
58-
${CMAKE_CURRENT_BINARY_DIR}
5957
${CMAKE_CURRENT_SOURCE_DIR}/databaseconnection
6058
${CMAKE_CURRENT_SOURCE_DIR}/eventbrowser
6159
${CMAKE_CURRENT_SOURCE_DIR}/idtool
62-
${CMAKE_CURRENT_SOURCE_DIR}/../../gui
63-
${CMAKE_CURRENT_SOURCE_DIR}/../../core
64-
${CMAKE_CURRENT_SOURCE_DIR}/../../core/geometry
65-
${CMAKE_CURRENT_SOURCE_DIR}/../../core/metadata
66-
${CMAKE_CURRENT_SOURCE_DIR}/../../core/raster
67-
${CMAKE_CURRENT_SOURCE_DIR}/..
60+
61+
${CMAKE_SOURCE_DIR}/src/gui
62+
${CMAKE_SOURCE_DIR}/src/core
63+
${CMAKE_SOURCE_DIR}/src/core/expression
64+
${CMAKE_SOURCE_DIR}/src/core/geometry
65+
${CMAKE_SOURCE_DIR}/src/core/metadata
66+
${CMAKE_SOURCE_DIR}/src/core/raster
67+
${CMAKE_SOURCE_DIR}/src/plugins
68+
6869
${CMAKE_BINARY_DIR}/src/core
6970
${CMAKE_BINARY_DIR}/src/gui
71+
${CMAKE_CURRENT_BINARY_DIR}
7072
)
7173

7274
TARGET_LINK_LIBRARIES(evis

‎src/plugins/geometry_checker/CMakeLists.txt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,18 @@ QT5_ADD_RESOURCES(geometrychecker_RCC_SRCS ${geometrychecker_RCCS})
8686
ADD_LIBRARY (geometrycheckerplugin MODULE ${geometrychecker_HDRS} ${geometrychecker_SRCS} ${geometrychecker_MOC_SRCS} ${geometrychecker_RCC_SRCS} ${geometrychecker_UIS_H})
8787

8888
INCLUDE_DIRECTORIES(
89-
${CMAKE_CURRENT_BINARY_DIR}
90-
../../core
91-
../../core/geometry
92-
../../core/metadata
93-
../../core/symbology-ng
94-
../../gui
95-
..
89+
${CMAKE_SOURCE_DIR}/src/core
90+
${CMAKE_SOURCE_DIR}/src/core/expression
91+
${CMAKE_SOURCE_DIR}/src/core/geometry
92+
${CMAKE_SOURCE_DIR}/src/core/metadata
93+
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
94+
${CMAKE_SOURCE_DIR}/src/gui
95+
${CMAKE_SOURCE_DIR}/src/plugins
96+
9697
${CMAKE_BINARY_DIR}/src/core
9798
${CMAKE_BINARY_DIR}/src/gui
99+
100+
${CMAKE_CURRENT_BINARY_DIR}
98101
)
99102
INCLUDE_DIRECTORIES(SYSTEM
100103
${GEOS_INCLUDE_DIR}

‎src/plugins/georeferencer/CMakeLists.txt

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,23 @@ ADD_LIBRARY (georefplugin MODULE ${GEOREF_SRCS} ${GEOREF_MOC_SRCS} ${GEOREF_RCC_
7474

7575
INCLUDE_DIRECTORIES(
7676
${CMAKE_CURRENT_SOURCE_DIR}
77-
${CMAKE_CURRENT_BINARY_DIR}
78-
${CMAKE_CURRENT_BINARY_DIR}/../../ui
79-
../../core ../../core/geometry ../../core/metadata ../../core/raster ../../core/composer
80-
../../gui ../../gui/editorwidgets ../../gui/layertree
81-
..
77+
${CMAKE_SOURCE_DIR}/src/core
78+
${CMAKE_SOURCE_DIR}/src/core/expression
79+
${CMAKE_SOURCE_DIR}/src/core/geometry
80+
${CMAKE_SOURCE_DIR}/src/core/metadata
81+
${CMAKE_SOURCE_DIR}/src/core/raster
82+
${CMAKE_SOURCE_DIR}/src/core/composer
83+
${CMAKE_SOURCE_DIR}/src/gui
84+
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
85+
${CMAKE_SOURCE_DIR}/src/gui/layertree
86+
${CMAKE_SOURCE_DIR}/src/plugins
87+
8288
${CMAKE_BINARY_DIR}/src/core
8389
${CMAKE_BINARY_DIR}/src/gui
8490
${CMAKE_BINARY_DIR}/src/app
91+
${CMAKE_BINARY_DIR}/src/ui
92+
93+
${CMAKE_CURRENT_BINARY_DIR}
8594
)
8695
INCLUDE_DIRECTORIES(SYSTEM
8796
${GSL_INCLUDE_DIR}

‎src/plugins/gps_importer/CMakeLists.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,22 @@ QT5_ADD_RESOURCES(GPS_RCC_SRCS ${GPS_RCCS})
3535
ADD_LIBRARY (gpsimporterplugin MODULE ${GPS_SRCS} ${GPS_MOC_SRCS} ${GPS_RCC_SRCS} ${GPS_UIS_H})
3636

3737
INCLUDE_DIRECTORIES(
38-
${CMAKE_CURRENT_SOURCE_DIR}
39-
${CMAKE_CURRENT_BINARY_DIR}
40-
${QEXTSERIALPORT_INCLUDE_DIR}
41-
../../core
42-
../../core/geometry
43-
../../core/metadata
44-
../../core/gps
45-
../../gui
46-
..
38+
${CMAKE_SOURCE_DIR}/src/core
39+
${CMAKE_SOURCE_DIR}/src/core/expression
40+
${CMAKE_SOURCE_DIR}/src/core/geometry
41+
${CMAKE_SOURCE_DIR}/src/core/metadata
42+
${CMAKE_SOURCE_DIR}/src/core/gps
43+
${CMAKE_SOURCE_DIR}/src/gui
44+
${CMAKE_SOURCE_DIR}/src/plugins
45+
4746
${CMAKE_BINARY_DIR}/src/core
4847
${CMAKE_BINARY_DIR}/src/gui
48+
${CMAKE_CURRENT_BINARY_DIR}
4949
)
5050
INCLUDE_DIRECTORIES(SYSTEM
5151
${EXPAT_INCLUDE_DIR}
5252
${PROJ_INCLUDE_DIR}
53+
${QEXTSERIALPORT_INCLUDE_DIR}
5354
)
5455

5556
TARGET_LINK_LIBRARIES(gpsimporterplugin

‎src/plugins/offline_editing/CMakeLists.txt

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,19 @@ INCLUDE_DIRECTORIES(SYSTEM
5050
)
5151

5252
INCLUDE_DIRECTORIES(
53-
${CMAKE_CURRENT_BINARY_DIR}
54-
../../core
55-
../../core/geometry
56-
../../core/metadata
57-
../../core/layertree
58-
../../core/raster
59-
../../gui
60-
../../gui/layertree
61-
..
53+
${CMAKE_SOURCE_DIR}/src/core
54+
${CMAKE_SOURCE_DIR}/src/core/expression
55+
${CMAKE_SOURCE_DIR}/src/core/geometry
56+
${CMAKE_SOURCE_DIR}/src/core/metadata
57+
${CMAKE_SOURCE_DIR}/src/core/layertree
58+
${CMAKE_SOURCE_DIR}/src/core/raster
59+
${CMAKE_SOURCE_DIR}/src/gui
60+
${CMAKE_SOURCE_DIR}/src/gui/layertree
61+
${CMAKE_SOURCE_DIR}/src/plugins
62+
6263
${CMAKE_BINARY_DIR}/src/core
6364
${CMAKE_BINARY_DIR}/src/gui
65+
${CMAKE_CURRENT_BINARY_DIR}
6466
)
6567

6668
########################################################

‎src/plugins/spatialquery/CMakeLists.txt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,18 @@ INCLUDE_DIRECTORIES(SYSTEM
3636
)
3737

3838
INCLUDE_DIRECTORIES(
39-
${CMAKE_CURRENT_BINARY_DIR}
40-
${CMAKE_CURRENT_BINARY_DIR}/../../ui/
41-
../../core
42-
../../core/geometry
43-
../../core/metadata
44-
../../core/raster
45-
../../gui
46-
..
39+
${CMAKE_SOURCE_DIR}/src/core
40+
${CMAKE_SOURCE_DIR}/src/core/geometry
41+
${CMAKE_SOURCE_DIR}/src/core/expression
42+
${CMAKE_SOURCE_DIR}/src/core/metadata
43+
${CMAKE_SOURCE_DIR}/src/core/raster
44+
${CMAKE_SOURCE_DIR}/src/gui
45+
${CMAKE_SOURCE_DIR}/src/plugins
46+
4747
${CMAKE_BINARY_DIR}/src/core
4848
${CMAKE_BINARY_DIR}/src/gui
49+
${CMAKE_BINARY_DIR}/src/ui
50+
${CMAKE_CURRENT_BINARY_DIR}
4951
)
5052

5153
TARGET_LINK_LIBRARIES(spatialqueryplugin

‎src/plugins/topology/CMakeLists.txt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,18 @@ INCLUDE_DIRECTORIES(SYSTEM
4242
)
4343

4444
INCLUDE_DIRECTORIES(
45-
${CMAKE_BINARY_DIR}/src/ui
46-
${CMAKE_CURRENT_BINARY_DIR}
47-
../../core ../../core/geometry ../../core/metadata ../../core/raster
48-
../../gui
49-
..
45+
${CMAKE_SOURCE_DIR}/src/core
46+
${CMAKE_SOURCE_DIR}/src/core/expression
47+
${CMAKE_SOURCE_DIR}/src/core/geometry
48+
${CMAKE_SOURCE_DIR}/src/core/metadata
49+
${CMAKE_SOURCE_DIR}/src/core/raster
50+
${CMAKE_SOURCE_DIR}/src/gui
51+
${CMAKE_SOURCE_DIR}/src/plugins
52+
5053
${CMAKE_BINARY_DIR}/src/core
5154
${CMAKE_BINARY_DIR}/src/gui
55+
${CMAKE_BINARY_DIR}/src/ui
56+
${CMAKE_CURRENT_BINARY_DIR}
5257
)
5358

5459
TARGET_LINK_LIBRARIES(topolplugin

‎src/providers/arcgisrest/CMakeLists.txt

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
INCLUDE_DIRECTORIES(
2-
../../core
3-
../../core/auth
4-
../../core/geometry
5-
../../core/raster
6-
../../core/metadata
7-
../../gui
8-
../../gui/auth
9-
${GEOS_INCLUDE_DIR}
10-
${QSCINTILLA_INCLUDE_DIR}
11-
${CMAKE_CURRENT_BINARY_DIR}/../../ui
2+
${CMAKE_SOURCE_DIR}/src/core
3+
${CMAKE_SOURCE_DIR}/src/core/auth
4+
${CMAKE_SOURCE_DIR}/src/core/expression
5+
${CMAKE_SOURCE_DIR}/src/core/geometry
6+
${CMAKE_SOURCE_DIR}/src/core/raster
7+
${CMAKE_SOURCE_DIR}/src/core/metadata
8+
${CMAKE_SOURCE_DIR}/src/gui
9+
${CMAKE_SOURCE_DIR}/src/gui/auth
10+
${CMAKE_BINARY_DIR}/src/ui
1211
${CMAKE_BINARY_DIR}/src/core
1312
${CMAKE_BINARY_DIR}/src/gui
1413
)
1514

15+
INCLUDE_DIRECTORIES(SYSTEM
16+
${GEOS_INCLUDE_DIR}
17+
${QSCINTILLA_INCLUDE_DIR}
18+
)
19+
1620
###############################################################################
1721

1822
SET (AFS_SRCS

‎src/providers/db2/CMakeLists.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,18 @@ SET(DB2_MOC_HDRS
2626
QT5_WRAP_CPP(DB2_MOC_SRCS ${DB2_MOC_HDRS})
2727

2828
INCLUDE_DIRECTORIES(
29-
.
30-
../../core
31-
../../core/auth
32-
../../core/geometry
33-
../../core/metadata
34-
../../gui
35-
../../gui/auth
36-
../../ui
37-
${CMAKE_CURRENT_BINARY_DIR}/../../ui
29+
${CMAKE_SOURCE_DIR}/src/core
30+
${CMAKE_SOURCE_DIR}/src/core/auth
31+
${CMAKE_SOURCE_DIR}/src/core/expression
32+
${CMAKE_SOURCE_DIR}/src/core/geometry
33+
${CMAKE_SOURCE_DIR}/src/core/metadata
34+
${CMAKE_SOURCE_DIR}/src/gui
35+
${CMAKE_SOURCE_DIR}/src/gui/auth
36+
${CMAKE_SOURCE_DIR}/src/ui
37+
3838
${CMAKE_BINARY_DIR}/src/core
3939
${CMAKE_BINARY_DIR}/src/gui
40+
${CMAKE_BINARY_DIR}/src/ui
4041
)
4142

4243
INCLUDE_DIRECTORIES(SYSTEM

‎src/providers/delimitedtext/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ SET (DTEXT_MOC_HDRS
1919
# Build
2020

2121
INCLUDE_DIRECTORIES(
22-
../../core
23-
../../core/geometry
24-
../../core/metadata
25-
../../gui
22+
${CMAKE_SOURCE_DIR}/src/core
23+
${CMAKE_SOURCE_DIR}/src/core/expression
24+
${CMAKE_SOURCE_DIR}/src/core/geometry
25+
${CMAKE_SOURCE_DIR}/src/core/metadata
26+
${CMAKE_SOURCE_DIR}/src/gui
27+
2628
${CMAKE_BINARY_DIR}/src/core
2729
${CMAKE_BINARY_DIR}/src/gui
30+
${CMAKE_BINARY_DIR}/src/ui
2831
)
2932
INCLUDE_DIRECTORIES (SYSTEM
3033
${GEOS_INCLUDE_DIR}
3134
)
32-
INCLUDE_DIRECTORIES (
33-
${CMAKE_CURRENT_BINARY_DIR}/../../ui
34-
)
3535

3636
QT5_WRAP_CPP(DTEXT_MOC_SRCS ${DTEXT_MOC_HDRS})
3737

‎src/providers/gdal/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ SET(GDAL_MOC_HDRS
99
)
1010

1111
INCLUDE_DIRECTORIES (
12-
../../core
13-
../../core/raster
14-
../../core/geometry
15-
../../core/metadata
16-
../../gui
17-
${CMAKE_CURRENT_BINARY_DIR}/../../ui
12+
${CMAKE_SOURCE_DIR}/src/core
13+
${CMAKE_SOURCE_DIR}/src/core/expression
14+
${CMAKE_SOURCE_DIR}/src/core/raster
15+
${CMAKE_SOURCE_DIR}/src/core/geometry
16+
${CMAKE_SOURCE_DIR}/src/core/metadata
17+
${CMAKE_SOURCE_DIR}/src/gui
18+
1819
${CMAKE_BINARY_DIR}/src/core
1920
${CMAKE_BINARY_DIR}/src/gui
21+
${CMAKE_BINARY_DIR}/src/ui
2022
)
2123
INCLUDE_DIRECTORIES (SYSTEM
2224
${GDAL_INCLUDE_DIR}
23-
# ${PROJ_INCLUDE_DIR}
24-
# ${GEOS_INCLUDE_DIR}
2525
)
2626

2727
QT5_WRAP_CPP(GDAL_MOC_SRCS ${GDAL_MOC_HDRS})

‎src/providers/mssql/CMakeLists.txt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,15 @@ SET(MSSQL_HDRS
2727
QT5_WRAP_CPP(MSSQL_MOC_SRCS ${MSSQL_MOC_HDRS})
2828

2929
INCLUDE_DIRECTORIES(
30-
.
31-
../../core
32-
../../core/geometry
33-
../../core/metadata
30+
${CMAKE_SOURCE_DIR}/src/core
31+
${CMAKE_SOURCE_DIR}/src/core/expression
32+
${CMAKE_SOURCE_DIR}/src/core/geometry
33+
${CMAKE_SOURCE_DIR}/src/core/metadata
34+
${CMAKE_SOURCE_DIR}/src/gui
35+
3436
${CMAKE_BINARY_DIR}/src/core
3537
${CMAKE_BINARY_DIR}/src/gui
38+
${CMAKE_BINARY_DIR}/src/ui
3639
)
3740
INCLUDE_DIRECTORIES(SYSTEM
3841
${GDAL_INCLUDE_DIR}
@@ -41,10 +44,6 @@ INCLUDE_DIRECTORIES(SYSTEM
4144
${QSCINTILLA_INCLUDE_DIR}
4245
${PROJ_INCLUDE_DIR}
4346
)
44-
INCLUDE_DIRECTORIES(
45-
../../gui
46-
${CMAKE_CURRENT_BINARY_DIR}/../../ui
47-
)
4847

4948

5049
ADD_LIBRARY(mssqlprovider MODULE ${MSSQL_SRCS} ${MSSQL_MOC_SRCS} ${MSSQL_HDRS})

‎src/providers/mssql/qgsmssqlexpressioncompiler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ QgsMssqlExpressionCompiler::QgsMssqlExpressionCompiler( QgsMssqlFeatureSource *s
2323

2424
}
2525

26-
QgsSqlExpressionCompiler::Result QgsMssqlExpressionCompiler::compileNode( const QgsExpression::Node *node, QString &result )
26+
QgsSqlExpressionCompiler::Result QgsMssqlExpressionCompiler::compileNode( const QgsExpressionNode *node, QString &result )
2727
{
2828
if ( node->nodeType() == QgsExpressionNode::ntBinaryOperator )
2929
{

‎src/providers/mssql/qgsmssqlexpressioncompiler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class QgsMssqlExpressionCompiler : public QgsSqlExpressionCompiler
2727
explicit QgsMssqlExpressionCompiler( QgsMssqlFeatureSource *source );
2828

2929
protected:
30-
virtual Result compileNode( const QgsExpression::Node *node, QString &result ) override;
30+
virtual Result compileNode( const QgsExpressionNode *node, QString &result ) override;
3131
virtual QString quotedValue( const QVariant &value, bool &ok ) override;
3232

3333
};

‎src/providers/ogr/qgsogrexpressioncompiler.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
***************************************************************************/
1515

1616
#include "qgsogrexpressioncompiler.h"
17+
#include "qgsexpressionnodeimpl.h"
1718
#include "qgsogrprovider.h"
1819

1920
QgsOgrExpressionCompiler::QgsOgrExpressionCompiler( QgsOgrFeatureSource *source )
@@ -45,13 +46,13 @@ QgsSqlExpressionCompiler::Result QgsOgrExpressionCompiler::compile( const QgsExp
4546
return QgsSqlExpressionCompiler::compile( exp );
4647
}
4748

48-
QgsSqlExpressionCompiler::Result QgsOgrExpressionCompiler::compileNode( const QgsExpression::Node *node, QString &result )
49+
QgsSqlExpressionCompiler::Result QgsOgrExpressionCompiler::compileNode( const QgsExpressionNode *node, QString &result )
4950
{
5051
switch ( node->nodeType() )
5152
{
5253
case QgsExpressionNode::ntBinaryOperator:
5354
{
54-
switch ( static_cast<const QgsExpression::NodeBinaryOperator *>( node )->op() )
55+
switch ( static_cast<const QgsExpressionNodeBinaryOperator *>( node )->op() )
5556
{
5657
case QgsExpressionNodeBinaryOperator::boILike:
5758
case QgsExpressionNodeBinaryOperator::boNotILike:

‎src/providers/ogr/qgsogrexpressioncompiler.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616
#ifndef QGSOGREXPRESSIONCOMPILER_H
1717
#define QGSOGREXPRESSIONCOMPILER_H
1818

19-
#include "qgsexpression.h"
2019
#include "qgsogrfeatureiterator.h"
2120
#include "qgssqlexpressioncompiler.h"
2221

22+
class QgsExpressionNode;
23+
class QgsExpression;
24+
2325
class QgsOgrExpressionCompiler : public QgsSqlExpressionCompiler
2426
{
2527
public:
@@ -30,7 +32,7 @@ class QgsOgrExpressionCompiler : public QgsSqlExpressionCompiler
3032

3133
protected:
3234

33-
virtual Result compileNode( const QgsExpression::Node *node, QString &str ) override;
35+
virtual Result compileNode( const QgsExpressionNode *node, QString &str ) override;
3436
virtual QString quotedIdentifier( const QString &identifier ) override;
3537
virtual QString quotedValue( const QVariant &value, bool &ok ) override;
3638
virtual QString castToReal( const QString &value ) const override;

‎src/providers/oracle/CMakeLists.txt

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,18 @@ SET(ORACLE_HDRS
3939
QT5_WRAP_CPP(ORACLE_MOC_SRCS ${ORACLE_MOC_HDRS})
4040

4141
INCLUDE_DIRECTORIES(
42-
../../core
43-
../../core/geometry
44-
../../core/metadata
45-
../../gui
42+
${CMAKE_SOURCE_DIR}/src/core
43+
${CMAKE_SOURCE_DIR}/src/core/expression
44+
${CMAKE_SOURCE_DIR}/src/core/geometry
45+
${CMAKE_SOURCE_DIR}/src/core/metadata
46+
${CMAKE_SOURCE_DIR}/src/gui
47+
4648
${CMAKE_BINARY_DIR}/src/core
4749
${CMAKE_BINARY_DIR}/src/gui
50+
${CMAKE_BINARY_DIR}/src/ui
4851
)
4952
INCLUDE_DIRECTORIES(SYSTEM
5053
${GEOS_INCLUDE_DIR}
51-
)
52-
INCLUDE_DIRECTORIES(
53-
${CMAKE_CURRENT_BINARY_DIR}/../../ui
54-
)
55-
INCLUDE_DIRECTORIES(SYSTEM
5654
${QT_QTSQL_INCLUDEDIR}
5755
${QSCINTILLA_INCLUDE_DIR}
5856
)

‎src/providers/oracle/qgsoracleexpressioncompiler.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ QgsOracleExpressionCompiler::QgsOracleExpressionCompiler( QgsOracleFeatureSource
2121
{
2222
}
2323

24-
QgsSqlExpressionCompiler::Result QgsOracleExpressionCompiler::compileNode( const QgsExpression::Node *node, QString &result )
24+
QgsSqlExpressionCompiler::Result QgsOracleExpressionCompiler::compileNode( const QgsExpressionNode *node, QString &result )
2525
{
26-
if ( node->nodeType() == QgsExpression::ntBinaryOperator )
26+
if ( node->nodeType() == QgsExpressionNode::ntBinaryOperator )
2727
{
28-
const QgsExpression::NodeBinaryOperator *bin( static_cast<const QgsExpression::NodeBinaryOperator *>( node ) );
28+
const QgsExpressionNodeBinaryOperator *bin( static_cast<const QgsExpressionNodeBinaryOperator *>( node ) );
2929

3030
switch ( bin->op() )
3131
{
32-
case QgsExpression::boConcat:
32+
case QgsExpressionNodeBinaryOperator::boConcat:
3333
// oracle's handling of || WRT null is not standards compliant
3434
return Fail;
3535

36-
case QgsExpression::boPow:
37-
case QgsExpression::boRegexp:
38-
case QgsExpression::boILike:
39-
case QgsExpression::boNotILike:
40-
case QgsExpression::boMod:
36+
case QgsExpressionNodeBinaryOperator::boPow:
37+
case QgsExpressionNodeBinaryOperator::boRegexp:
38+
case QgsExpressionNodeBinaryOperator::boILike:
39+
case QgsExpressionNodeBinaryOperator::boNotILike:
40+
case QgsExpressionNodeBinaryOperator::boMod:
4141
{
4242
QString op1, op2;
4343

@@ -47,23 +47,23 @@ QgsSqlExpressionCompiler::Result QgsOracleExpressionCompiler::compileNode( const
4747

4848
switch ( bin->op() )
4949
{
50-
case QgsExpression::boPow:
50+
case QgsExpressionNodeBinaryOperator::boPow:
5151
result = QString( "power(%1,%2)" ).arg( op1, op2 );
5252
return Complete;
5353

54-
case QgsExpression::boRegexp:
54+
case QgsExpressionNodeBinaryOperator::boRegexp:
5555
result = QString( "regexp_like(%1,%2)" ).arg( op1, op2 );
5656
return Complete;
5757

58-
case QgsExpression::boILike:
58+
case QgsExpressionNodeBinaryOperator::boILike:
5959
result = QString( "lower(%1) LIKE lower(%2)" ).arg( op1, op2 );
6060
return Complete;
6161

62-
case QgsExpression::boNotILike:
62+
case QgsExpressionNodeBinaryOperator::boNotILike:
6363
result = QString( "NOT lower(%1) LIKE lower(%2)" ).arg( op1, op2 );
6464
return Complete;
6565

66-
case QgsExpression::boMod :
66+
case QgsExpressionNodeBinaryOperator::boMod :
6767
result = QString( "MOD(%1,%2)" ).arg( op1, op2 );
6868
return Complete;
6969

‎src/providers/oracle/qgsoracleexpressioncompiler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class QgsOracleExpressionCompiler : public QgsSqlExpressionCompiler
2727
explicit QgsOracleExpressionCompiler( QgsOracleFeatureSource *source );
2828

2929
protected:
30-
virtual Result compileNode( const QgsExpression::Node *node, QString &result ) override;
30+
virtual Result compileNode( const QgsExpressionNode *node, QString &result ) override;
3131
virtual QString quotedIdentifier( const QString &identifier ) override;
3232
virtual QString quotedValue( const QVariant &value, bool &ok ) override;
3333
};

‎src/providers/ows/CMakeLists.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ SET(OWS_MOC_HDRS
88
)
99

1010
INCLUDE_DIRECTORIES (
11-
../../core
12-
../../core/geometry
13-
../../core/auth
14-
../../core/metadata
15-
../../gui
16-
../../gui/auth
17-
${CMAKE_CURRENT_BINARY_DIR}/../../ui
11+
${CMAKE_SOURCE_DIR}/src/core
12+
${CMAKE_SOURCE_DIR}/src/core/expression
13+
${CMAKE_SOURCE_DIR}/src/core/geometry
14+
${CMAKE_SOURCE_DIR}/src/core/auth
15+
${CMAKE_SOURCE_DIR}/src/core/metadata
16+
${CMAKE_SOURCE_DIR}/src/gui
17+
${CMAKE_SOURCE_DIR}/src/gui/auth
18+
1819
${CMAKE_BINARY_DIR}/src/core
1920
${CMAKE_BINARY_DIR}/src/gui
21+
${CMAKE_BINARY_DIR}/src/ui
2022
)
2123
INCLUDE_DIRECTORIES(SYSTEM
2224
${PROJ_INCLUDE_DIR}

‎src/providers/postgres/CMakeLists.txt

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,28 +38,26 @@ SET(PG_HDRS
3838
QT5_WRAP_CPP(PG_MOC_SRCS ${PG_MOC_HDRS})
3939

4040
INCLUDE_DIRECTORIES(
41-
../../core
42-
../../core/auth
43-
../../core/geometry
44-
../../core/metadata
41+
${CMAKE_SOURCE_DIR}/src/core
42+
${CMAKE_SOURCE_DIR}/src/core/auth
43+
${CMAKE_SOURCE_DIR}/src/core/expression
44+
${CMAKE_SOURCE_DIR}/src/core/geometry
45+
${CMAKE_SOURCE_DIR}/src/core/metadata
46+
${CMAKE_SOURCE_DIR}/src/gui
47+
${CMAKE_SOURCE_DIR}/src/gui/auth
48+
4549
${CMAKE_BINARY_DIR}/src/core
4650
${CMAKE_BINARY_DIR}/src/gui
51+
${CMAKE_BINARY_DIR}/src/ui
4752
)
53+
4854
INCLUDE_DIRECTORIES(SYSTEM
4955
${POSTGRES_INCLUDE_DIR}
5056
${GEOS_INCLUDE_DIR}
5157
${QSCINTILLA_INCLUDE_DIR}
5258
${QCA_INCLUDE_DIR}
5359
${QTKEYCHAIN_INCLUDE_DIR}
5460
)
55-
INCLUDE_DIRECTORIES(
56-
../../core
57-
../../gui
58-
../../gui/auth
59-
../../ui
60-
${CMAKE_CURRENT_BINARY_DIR}/../../ui
61-
)
62-
6361
ADD_LIBRARY (postgresprovider_a STATIC ${PG_SRCS} ${PG_HDRS} ${PG_MOC_SRCS})
6462
ADD_LIBRARY (postgresprovider MODULE ${PG_SRCS} ${PG_HDRS} ${PG_MOC_SRCS})
6563

‎src/providers/postgres/qgspostgresexpressioncompiler.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ QString QgsPostgresExpressionCompiler::castToInt( const QString &value ) const
144144
return QStringLiteral( "((%1)::int)" ).arg( value );
145145
}
146146

147-
QgsSqlExpressionCompiler::Result QgsPostgresExpressionCompiler::compileNode( const QgsExpression::Node *node, QString &result )
147+
QgsSqlExpressionCompiler::Result QgsPostgresExpressionCompiler::compileNode( const QgsExpressionNode *node, QString &result )
148148
{
149149
switch ( node->nodeType() )
150150
{
151-
case QgsExpression::ntFunction:
151+
case QgsExpressionNode::ntFunction:
152152
{
153-
const QgsExpression::NodeFunction *n = static_cast<const QgsExpression::NodeFunction *>( node );
153+
const QgsExpressionNodeFunction *n = static_cast<const QgsExpressionNodeFunction *>( node );
154154

155-
QgsExpression::Function *fd = QgsExpression::Functions()[n->fnIndex()];
155+
QgsExpressionFunction *fd = QgsExpression::Functions()[n->fnIndex()];
156156
if ( fd->name() == "$geometry" )
157157
{
158158
result = quotedIdentifier( mGeometryColumn );

‎src/providers/postgres/qgspostgresexpressioncompiler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class QgsPostgresExpressionCompiler : public QgsSqlExpressionCompiler
3131

3232
virtual QString quotedIdentifier( const QString &identifier ) override;
3333
virtual QString quotedValue( const QVariant &value, bool &ok ) override;
34-
virtual Result compileNode( const QgsExpression::Node *node, QString &str ) override;
34+
virtual Result compileNode( const QgsExpressionNode *node, QString &str ) override;
3535
virtual QString sqlFunctionFromFunctionName( const QString &fnName ) const override;
3636
virtual QStringList sqlArgumentsFromFunctionName( const QString &fnName, const QStringList &fnArgs ) const override;
3737
virtual QString castToReal( const QString &value ) const override;

‎src/providers/spatialite/CMakeLists.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@ INCLUDE_DIRECTORIES(SYSTEM
3434
${QSCINTILLA_INCLUDE_DIR}
3535
)
3636
INCLUDE_DIRECTORIES(
37-
../../core
38-
../../core/geometry
39-
../../core/metadata
40-
../../gui
41-
${CMAKE_CURRENT_BINARY_DIR}/../../ui
37+
${CMAKE_SOURCE_DIR}/src/core
38+
${CMAKE_SOURCE_DIR}/src/core/expression
39+
${CMAKE_SOURCE_DIR}/src/core/geometry
40+
${CMAKE_SOURCE_DIR}/src/core/metadata
41+
${CMAKE_SOURCE_DIR}/src/gui
42+
4243
${CMAKE_BINARY_DIR}/src/core
4344
${CMAKE_BINARY_DIR}/src/gui
45+
${CMAKE_BINARY_DIR}/src/ui
4446
)
4547
INCLUDE_DIRECTORIES(SYSTEM
4648
${SQLITE3_INCLUDE_DIR}

‎src/providers/virtual/CMakeLists.txt

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,21 @@ SET(QGIS_VLAYER_PROVIDER_SRCS
2828
)
2929

3030
INCLUDE_DIRECTORIES(
31-
.
32-
../../core
33-
../../core/auth
34-
../../core/geometry
35-
../../core/metadata
31+
${CMAKE_SOURCE_DIR}/src/core
32+
${CMAKE_SOURCE_DIR}/src/core/auth
33+
${CMAKE_SOURCE_DIR}/src/core/expression
34+
${CMAKE_SOURCE_DIR}/src/core/geometry
35+
${CMAKE_SOURCE_DIR}/src/core/metadata
36+
${CMAKE_SOURCE_DIR}/src/gui
37+
${CMAKE_SOURCE_DIR}/src/gui/auth
38+
3639
${CMAKE_BINARY_DIR}/src/core
3740
${CMAKE_BINARY_DIR}/src/gui
41+
${CMAKE_BINARY_DIR}/src/ui
42+
43+
${CMAKE_CURRENT_BINARY_DIR} # ui_xxx_dlg.h
3844
)
45+
3946
INCLUDE_DIRECTORIES(SYSTEM
4047
${POSTGRES_INCLUDE_DIR}
4148
${SQLITE3_INCLUDE_DIR}
@@ -44,14 +51,6 @@ INCLUDE_DIRECTORIES(SYSTEM
4451
${QSCINTILLA_INCLUDE_DIR}
4552
${QCA_INCLUDE_DIR}
4653
)
47-
INCLUDE_DIRECTORIES(
48-
../../core
49-
../../gui
50-
../../gui/auth
51-
../../ui
52-
${CMAKE_CURRENT_BINARY_DIR}
53-
${CMAKE_CURRENT_BINARY_DIR}/../../ui
54-
)
5554

5655
ADD_LIBRARY(virtuallayerprovider MODULE
5756
${QGIS_VLAYER_PROVIDER_SRCS}

‎src/providers/wcs/CMakeLists.txt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,19 @@ SET (WCS_MOC_HDRS
1717
QT5_WRAP_CPP (WCS_MOC_SRCS ${WCS_MOC_HDRS})
1818

1919
INCLUDE_DIRECTORIES(
20-
.
21-
../../core
22-
../../core/auth
23-
../../core/raster
24-
../../core/geometry
25-
../../core/metadata
26-
../../gui
27-
../../gui/auth
28-
../gdal
29-
${CMAKE_CURRENT_BINARY_DIR}/../../ui
20+
${CMAKE_SOURCE_DIR}/src/core
21+
${CMAKE_SOURCE_DIR}/src/core/auth
22+
${CMAKE_SOURCE_DIR}/src/core/expression
23+
${CMAKE_SOURCE_DIR}/src/core/raster
24+
${CMAKE_SOURCE_DIR}/src/core/geometry
25+
${CMAKE_SOURCE_DIR}/src/core/metadata
26+
${CMAKE_SOURCE_DIR}/src/gui
27+
${CMAKE_SOURCE_DIR}/src/gui/auth
28+
${CMAKE_SOURCE_DIR}/src/providers/gdal
29+
3030
${CMAKE_BINARY_DIR}/src/core
3131
${CMAKE_BINARY_DIR}/src/gui
32+
${CMAKE_BINARY_DIR}/src/ui
3233
)
3334
INCLUDE_DIRECTORIES(SYSTEM
3435
${GDAL_INCLUDE_DIR}

‎src/providers/wfs/CMakeLists.txt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,18 @@ SET (WFS_MOC_HDRS
3737
QT5_WRAP_CPP(WFS_MOC_SRCS ${WFS_MOC_HDRS})
3838

3939
INCLUDE_DIRECTORIES (
40-
../../core
41-
../../core/auth
42-
../../core/geometry
43-
../../core/symbology-ng # needed by qgsvectorfilewriter.h
44-
../../core/metadata
45-
../../gui
46-
../../gui/auth
47-
${CMAKE_CURRENT_BINARY_DIR}/../../ui
40+
${CMAKE_SOURCE_DIR}/src/core
41+
${CMAKE_SOURCE_DIR}/src/core/auth
42+
${CMAKE_SOURCE_DIR}/src/core/expression
43+
${CMAKE_SOURCE_DIR}/src/core/geometry
44+
${CMAKE_SOURCE_DIR}/src/core/symbology-ng # needed by qgsvectorfilewriter.h
45+
${CMAKE_SOURCE_DIR}/src/core/metadata
46+
${CMAKE_SOURCE_DIR}/src/gui
47+
${CMAKE_SOURCE_DIR}/src/gui/auth
48+
4849
${CMAKE_BINARY_DIR}/src/core
4950
${CMAKE_BINARY_DIR}/src/gui
51+
${CMAKE_BINARY_DIR}/src/ui
5052
)
5153
INCLUDE_DIRECTORIES(SYSTEM
5254
${GEOS_INCLUDE_DIR}

‎src/providers/wms/CMakeLists.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,16 @@ SET (WMS_MOC_HDRS
2727
QT5_WRAP_CPP (WMS_MOC_SRCS ${WMS_MOC_HDRS})
2828

2929
INCLUDE_DIRECTORIES(
30-
.
31-
../../core
32-
../../core/auth
33-
../../core/geometry
34-
../../core/raster
35-
../../core/metadata
36-
../../gui
37-
../../gui/auth
38-
${CMAKE_CURRENT_BINARY_DIR}/../../ui
30+
${CMAKE_SOURCE_DIR}/src/core
31+
${CMAKE_SOURCE_DIR}/src/core/auth
32+
${CMAKE_SOURCE_DIR}/src/core/expression
33+
${CMAKE_SOURCE_DIR}/src/core/geometry
34+
${CMAKE_SOURCE_DIR}/src/core/raster
35+
${CMAKE_SOURCE_DIR}/src/core/metadata
36+
${CMAKE_SOURCE_DIR}/src/gui
37+
${CMAKE_SOURCE_DIR}/src/gui/auth
38+
39+
${CMAKE_BINARY_DIR}/src/ui
3940
${CMAKE_BINARY_DIR}/src/core
4041
${CMAKE_BINARY_DIR}/src/gui
4142
)

‎src/python/CMakeLists.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
SET(QGISPYTHON_SRCS qgispython.cpp qgspythonutilsimpl.cpp)
22

33
INCLUDE_DIRECTORIES(
4-
../core
5-
../core/geometry
6-
../core/metadata
7-
../core/raster
8-
../gui
4+
${CMAKE_SOURCE_DIR}/src/core
5+
${CMAKE_SOURCE_DIR}/src/core/expression
6+
${CMAKE_SOURCE_DIR}/src/core/geometry
7+
${CMAKE_SOURCE_DIR}/src/core/metadata
8+
${CMAKE_SOURCE_DIR}/src/core/raster
9+
${CMAKE_SOURCE_DIR}/src/gui
10+
911
${CMAKE_BINARY_DIR}/src/core
1012
${CMAKE_BINARY_DIR}/src/python
1113
)

‎tests/bench/CMakeLists.txt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ QT5_WRAP_CPP (BENCH_MOC_SRCS ${BENCH_MOC_HDRS})
1717

1818
ADD_EXECUTABLE (qgis_bench MACOSX_BUNDLE WIN32 ${BENCH_SRCS} ${BENCH_MOC_SRCS} )
1919

20-
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
21-
${CMAKE_CURRENT_SOURCE_DIR}/../../src/core
22-
${CMAKE_CURRENT_SOURCE_DIR}/../../src/core/geometry
23-
${CMAKE_CURRENT_SOURCE_DIR}/../../src/core/metadata
24-
${CMAKE_CURRENT_SOURCE_DIR}/../../src/core/raster
25-
${CMAKE_CURRENT_BINARY_DIR}
20+
INCLUDE_DIRECTORIES(
21+
${CMAKE_SOURCE_DIR}/src/core
22+
${CMAKE_SOURCE_DIR}/src/core/expression
23+
${CMAKE_SOURCE_DIR}/src/core/geometry
24+
${CMAKE_SOURCE_DIR}/src/core/metadata
25+
${CMAKE_SOURCE_DIR}/src/core/raster
26+
27+
${CMAKE_BINARY_DIR}
2628
${CMAKE_BINARY_DIR}/src/core
2729
)
2830
INCLUDE_DIRECTORIES(SYSTEM

‎tests/src/analysis/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
99
${CMAKE_CURRENT_BINARY_DIR}
1010
${CMAKE_SOURCE_DIR}/src/core
1111
${CMAKE_SOURCE_DIR}/src/core/auth
12+
${CMAKE_SOURCE_DIR}/src/core/expression
1213
${CMAKE_SOURCE_DIR}/src/core/geometry
1314
${CMAKE_SOURCE_DIR}/src/core/metadata
1415
${CMAKE_SOURCE_DIR}/src/core/raster
@@ -17,6 +18,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
1718
${CMAKE_SOURCE_DIR}/src/analysis/vector
1819
${CMAKE_SOURCE_DIR}/src/analysis/raster
1920
${CMAKE_SOURCE_DIR}/src/test
21+
2022
${CMAKE_BINARY_DIR}/src/core
2123
${CMAKE_BINARY_DIR}/src/analysis
2224
)

‎tests/src/app/CMakeLists.txt

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,34 @@
11
#####################################################
22
# Don't forget to include output directory, otherwise
33
# the UI file won't be wrapped!
4-
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
5-
${CMAKE_CURRENT_BINARY_DIR}
6-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core
7-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/auth
8-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/composer
9-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/geometry
10-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/metadata
11-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/raster
12-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/symbology-ng
13-
${CMAKE_CURRENT_BINARY_DIR}/../../../src/ui
14-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/ui
15-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui
16-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/editorwidgets
17-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/editorwidgets/core
18-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/attributetable
19-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/symbology-ng
20-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/raster
21-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/python
22-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/app
23-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/app/pluginmanager
24-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/test
4+
INCLUDE_DIRECTORIES(
5+
${CMAKE_CURRENT_SOURCE_DIR}
6+
${CMAKE_SOURCE_DIR}/src/core
7+
${CMAKE_SOURCE_DIR}/src/core/auth
8+
${CMAKE_SOURCE_DIR}/src/core/composer
9+
${CMAKE_SOURCE_DIR}/src/core/expression
10+
${CMAKE_SOURCE_DIR}/src/core/geometry
11+
${CMAKE_SOURCE_DIR}/src/core/metadata
12+
${CMAKE_SOURCE_DIR}/src/core/raster
13+
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
14+
${CMAKE_SOURCE_DIR}/src/ui
15+
${CMAKE_SOURCE_DIR}/src/gui
16+
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
17+
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
18+
${CMAKE_SOURCE_DIR}/src/gui/attributetable
19+
${CMAKE_SOURCE_DIR}/src/gui/symbology-ng
20+
${CMAKE_SOURCE_DIR}/src/gui/raster
21+
${CMAKE_SOURCE_DIR}/src/python
22+
${CMAKE_SOURCE_DIR}/src/app
23+
${CMAKE_SOURCE_DIR}/src/app/pluginmanager
24+
${CMAKE_SOURCE_DIR}/src/test
25+
2526
${CMAKE_BINARY_DIR}/src/core
2627
${CMAKE_BINARY_DIR}/src/gui
2728
${CMAKE_BINARY_DIR}/src/python
2829
${CMAKE_BINARY_DIR}/src/app
30+
${CMAKE_BINARY_DIR}/src/ui
31+
${CMAKE_CURRENT_BINARY_DIR}
2932
)
3033
INCLUDE_DIRECTORIES(SYSTEM
3134
${QT_INCLUDE_DIR}

‎tests/src/gui/CMakeLists.txt

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,28 @@ SET (util_SRCS)
66
# Don't forget to include output directory, otherwise
77
# the UI file won't be wrapped!
88
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
9-
${CMAKE_CURRENT_BINARY_DIR}
10-
${CMAKE_CURRENT_BINARY_DIR}/../../../src/ui
11-
${CMAKE_CURRENT_SOURCE_DIR}/../core #for render checker class
12-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui
13-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/editorwidgets
14-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/editorwidgets/core
15-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/symbology-ng
16-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/gui/raster
17-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core
18-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/auth
19-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/geometry
20-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/metadata
21-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/raster
22-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/core/symbology-ng
23-
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/test
9+
${CMAKE_SOURCE_DIR}/tests/core #for render checker class
10+
${CMAKE_SOURCE_DIR}/src/gui
11+
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
12+
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
13+
${CMAKE_SOURCE_DIR}/src/gui/symbology-ng
14+
${CMAKE_SOURCE_DIR}/src/gui/raster
15+
${CMAKE_SOURCE_DIR}/src/core
16+
${CMAKE_SOURCE_DIR}/src/core/expression
17+
${CMAKE_SOURCE_DIR}/src/core/auth
18+
${CMAKE_SOURCE_DIR}/src/core/geometry
19+
${CMAKE_SOURCE_DIR}/src/core/metadata
20+
${CMAKE_SOURCE_DIR}/src/core/raster
21+
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
22+
${CMAKE_SOURCE_DIR}/src/test
2423
${CMAKE_SOURCE_DIR}/src/native
25-
${CMAKE_BINARY_DIR}/src/native
24+
25+
2626
${CMAKE_BINARY_DIR}/src/core
2727
${CMAKE_BINARY_DIR}/src/gui
28+
${CMAKE_BINARY_DIR}/src/ui
29+
${CMAKE_BINARY_DIR}/src/native
30+
${CMAKE_CURRENT_BINARY_DIR}
2831
)
2932
INCLUDE_DIRECTORIES(SYSTEM
3033
${QT_INCLUDE_DIR}

‎tests/src/providers/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
77
${CMAKE_CURRENT_BINARY_DIR}
88
${CMAKE_SOURCE_DIR}/src/core
99
${CMAKE_SOURCE_DIR}/src/core/auth
10+
${CMAKE_SOURCE_DIR}/src/core/expression
1011
${CMAKE_SOURCE_DIR}/src/core/geometry
1112
${CMAKE_SOURCE_DIR}/src/core/metadata
1213
${CMAKE_SOURCE_DIR}/src/core/raster

0 commit comments

Comments
 (0)
Please sign in to comment.