Skip to content

Commit 1358822

Browse files
jef-njef-n
committed
include metadata headers in install (followup 3a965e6)
1 parent f004fc1 commit 1358822

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+54
-6
lines changed

‎src/analysis/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ INCLUDE_DIRECTORIES(
162162
${CMAKE_CURRENT_SOURCE_DIR}/../core/geometry
163163
${CMAKE_CURRENT_SOURCE_DIR}/../core/raster
164164
${CMAKE_CURRENT_SOURCE_DIR}/../core/symbology-ng
165+
${CMAKE_CURRENT_SOURCE_DIR}/../core/metadata
165166
${CMAKE_BINARY_DIR}/src/core
166167
${CMAKE_BINARY_DIR}/src/analysis
167168
interpolation

‎src/app/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,7 @@ INCLUDE_DIRECTORIES(
499499
../core/composer
500500
../core/dxf
501501
../core/geometry
502+
../core/metadata
502503
../core/layertree
503504
../core/providers/memory
504505
../core/raster

‎src/auth/basic/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES (
1919
../../core
2020
../../core/auth
2121
../../core/geometry
22+
../../core/metadata
2223
${CMAKE_BINARY_DIR}/src/core
2324
${CMAKE_BINARY_DIR}/src/gui
2425
)

‎src/auth/identcert/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES (
1919
../../core
2020
../../core/auth
2121
../../core/geometry
22+
../../core/metadata
2223
${CMAKE_BINARY_DIR}/src/core
2324
${CMAKE_BINARY_DIR}/src/gui
2425
)

‎src/auth/pkipaths/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES (
1919
../../core
2020
../../core/auth
2121
../../core/geometry
22+
../../core/metadata
2223
${CMAKE_BINARY_DIR}/src/core
2324
${CMAKE_BINARY_DIR}/src/gui
2425
)

‎src/auth/pkipkcs12/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES (
1919
../../core
2020
../../core/auth
2121
../../core/geometry
22+
../../core/metadata
2223
${CMAKE_BINARY_DIR}/src/core
2324
${CMAKE_BINARY_DIR}/src/gui
2425
)

‎src/core/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,6 @@ SET(QGIS_CORE_SRCS
338338
pal/pointset.cpp
339339
pal/priorityqueue.cpp
340340
pal/problem.cpp
341-
pal/rtree.hpp
342341
pal/util.cpp
343342

344343
raster/qgscliptominmaxenhancement.cpp
@@ -987,6 +986,9 @@ SET(QGIS_CORE_HDRS
987986
fieldformatter/qgsrelationreferencefieldformatter.h
988987
fieldformatter/qgsvaluemapfieldformatter.h
989988
fieldformatter/qgsvaluerelationfieldformatter.h
989+
990+
metadata/qgslayermetadata.h
991+
metadata/qgslayermetadatavalidator.h
990992
)
991993

992994
IF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND)
@@ -1017,6 +1019,7 @@ INCLUDE_DIRECTORIES(
10171019
scalebar
10181020
symbology-ng
10191021
gps/qextserialport
1022+
metadata
10201023
)
10211024
INCLUDE_DIRECTORIES(SYSTEM
10221025
${SPATIALINDEX_INCLUDE_DIR}

‎src/core/qgsmaplayer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "qgscoordinatereferencesystem.h"
3535
#include "qgsrendercontext.h"
3636
#include "qgsmaplayerdependency.h"
37-
#include "metadata/qgslayermetadata.h"
37+
#include "qgslayermetadata.h"
3838

3939
class QgsDataProvider;
4040
class QgsMapLayerLegend;

‎src/crssync/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ ADD_EXECUTABLE(crssync main.cpp)
33
INCLUDE_DIRECTORIES(
44
../core
55
../core/geometry
6+
../core/metadata
67
${CMAKE_BINARY_DIR}/src/core
78
)
89
INCLUDE_DIRECTORIES(SYSTEM

‎src/customwidgets/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ INCLUDE_DIRECTORIES(
103103
${CMAKE_CURRENT_SOURCE_DIR}
104104
${CMAKE_CURRENT_SOURCE_DIR}/../core/
105105
${CMAKE_CURRENT_SOURCE_DIR}/../core/geometry
106+
${CMAKE_CURRENT_SOURCE_DIR}/../core/metadata
106107
${CMAKE_CURRENT_SOURCE_DIR}/../core/symbology-ng/
107108
${CMAKE_CURRENT_SOURCE_DIR}/../gui/
108109
${CMAKE_CURRENT_SOURCE_DIR}/../gui/attributetable/

‎src/gui/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,7 @@ INCLUDE_DIRECTORIES(
753753
../core/scalebar
754754
../core/symbology-ng
755755
../core/effects
756+
../core/metadata
756757
${CMAKE_CURRENT_BINARY_DIR}
757758
${CMAKE_CURRENT_BINARY_DIR}/../ui
758759
)

‎src/helpviewer/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE WIN32 ${HELP_SRCS} ${HELP_MOC_SRCS} ${HE
5555
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
5656
${CMAKE_CURRENT_SOURCE_DIR}/../core
5757
${CMAKE_CURRENT_SOURCE_DIR}/../core/geometry
58+
${CMAKE_CURRENT_SOURCE_DIR}/../core/metadata
5859
${CMAKE_CURRENT_BINARY_DIR}
5960
${CMAKE_BINARY_DIR}/src/core
6061
)

‎src/plugins/coordinate_capture/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ INCLUDE_DIRECTORIES(
3232
${CMAKE_CURRENT_BINARY_DIR}/../../ui/
3333
../../core
3434
../../core/geometry
35+
../../core/metadata
3536
../../core/raster
3637
../../gui
3738
..

‎src/plugins/evis/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ INCLUDE_DIRECTORIES(
6262
${CMAKE_CURRENT_SOURCE_DIR}/../../gui
6363
${CMAKE_CURRENT_SOURCE_DIR}/../../core
6464
${CMAKE_CURRENT_SOURCE_DIR}/../../core/geometry
65+
${CMAKE_CURRENT_SOURCE_DIR}/../../core/metadata
6566
${CMAKE_CURRENT_SOURCE_DIR}/../../core/raster
6667
${CMAKE_CURRENT_SOURCE_DIR}/..
6768
${CMAKE_BINARY_DIR}/src/core

‎src/plugins/geometry_checker/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ INCLUDE_DIRECTORIES(
8989
${CMAKE_CURRENT_BINARY_DIR}
9090
../../core
9191
../../core/geometry
92+
../../core/metadata
9293
../../core/symbology-ng
9394
../../gui
9495
..

‎src/plugins/georeferencer/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ INCLUDE_DIRECTORIES(
7676
${CMAKE_CURRENT_SOURCE_DIR}
7777
${CMAKE_CURRENT_BINARY_DIR}
7878
${CMAKE_CURRENT_BINARY_DIR}/../../ui
79-
../../core ../../core/geometry ../../core/raster ../../core/composer
79+
../../core ../../core/geometry ../../core/metadata ../../core/raster ../../core/composer
8080
../../gui ../../gui/editorwidgets ../../gui/layertree
8181
..
8282
${CMAKE_BINARY_DIR}/src/core

‎src/plugins/globe/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ INCLUDE_DIRECTORIES(
6464
${SIP_INCLUDE_DIR}
6565
../../core
6666
../../core/geometry
67+
../../core/metadata
6768
../../core/raster
6869
../../core/symbology-ng
6970
../../gui

‎src/plugins/gps_importer/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ INCLUDE_DIRECTORIES(
4040
${QEXTSERIALPORT_INCLUDE_DIR}
4141
../../core
4242
../../core/geometry
43+
../../core/metadata
4344
../../core/gps
4445
../../gui
4546
..

‎src/plugins/grass/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ INCLUDE_DIRECTORIES(
153153
../../app
154154
../../core
155155
../../core/geometry
156+
../../core/metadata
156157
../../core/layertree
157158
../../core/raster
158159
../../core/symbology-ng

‎src/plugins/offline_editing/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ INCLUDE_DIRECTORIES(
5353
${CMAKE_CURRENT_BINARY_DIR}
5454
../../core
5555
../../core/geometry
56+
../../core/metadata
5657
../../core/layertree
5758
../../core/raster
5859
../../gui

‎src/plugins/plugin_template/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ADD_LIBRARY ([pluginlcasename]plugin MODULE ${[pluginlcasename]_SRCS} ${[pluginl
2929

3030
INCLUDE_DIRECTORIES(
3131
${CMAKE_CURRENT_BINARY_DIR}
32-
../../core ../../core/geometry ../../core/raster
32+
../../core ../../core/geometry ../../core/metadata ../../core/raster
3333
../../gui
3434
..
3535
)

‎src/plugins/spatialquery/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ INCLUDE_DIRECTORIES(
4040
${CMAKE_CURRENT_BINARY_DIR}/../../ui/
4141
../../core
4242
../../core/geometry
43+
../../core/metadata
4344
../../core/raster
4445
../../gui
4546
..

‎src/plugins/topology/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ INCLUDE_DIRECTORIES(SYSTEM
4444
INCLUDE_DIRECTORIES(
4545
${CMAKE_BINARY_DIR}/src/ui
4646
${CMAKE_CURRENT_BINARY_DIR}
47-
../../core ../../core/geometry ../../core/raster
47+
../../core ../../core/geometry ../../core/metadata ../../core/raster
4848
../../gui
4949
..
5050
${CMAKE_BINARY_DIR}/src/core

‎src/providers/arcgisrest/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ INCLUDE_DIRECTORIES(
33
../../core/auth
44
../../core/geometry
55
../../core/raster
6+
../../core/metadata
67
../../gui
78
../../gui/auth
89
${GEOS_INCLUDE_DIR}

‎src/providers/db2/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
3030
../../core
3131
../../core/auth
3232
../../core/geometry
33+
../../core/metadata
3334
../../gui
3435
../../gui/auth
3536
../../ui

‎src/providers/delimitedtext/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ SET (DTEXT_MOC_HDRS
2121
INCLUDE_DIRECTORIES(
2222
../../core
2323
../../core/geometry
24+
../../core/metadata
2425
../../gui
2526
${CMAKE_BINARY_DIR}/src/core
2627
${CMAKE_BINARY_DIR}/src/gui

‎src/providers/gdal/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ INCLUDE_DIRECTORIES (
1212
../../core
1313
../../core/raster
1414
../../core/geometry
15+
../../core/metadata
1516
../../gui
1617
${CMAKE_CURRENT_BINARY_DIR}/../../ui
1718
${CMAKE_BINARY_DIR}/src/core

‎src/providers/gpx/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ SET (GPX_MOC_HDRS
1818
INCLUDE_DIRECTORIES(
1919
../../core
2020
../../core/geometry
21+
../../core/metadata
2122
${CMAKE_BINARY_DIR}/src/core
2223
${CMAKE_BINARY_DIR}/src/gui
2324
)

‎src/providers/grass/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
INCLUDE_DIRECTORIES(
66
../../core
77
../../core/geometry
8+
../../core/metadata
89
../../core/raster
910
../../gui
1011
${CMAKE_CURRENT_BINARY_DIR}

‎src/providers/mssql/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
3030
.
3131
../../core
3232
../../core/geometry
33+
../../core/metadata
3334
${CMAKE_BINARY_DIR}/src/core
3435
${CMAKE_BINARY_DIR}/src/gui
3536
)

‎src/providers/ogr/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ INCLUDE_DIRECTORIES(
1212
.
1313
../../core
1414
../../core/geometry
15+
../../core/metadata
1516
${CMAKE_CURRENT_SOURCE_DIR}/../../core/symbology-ng
1617
${CMAKE_BINARY_DIR}/src/core
1718
${CMAKE_BINARY_DIR}/src/gui

‎src/providers/oracle/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ QT5_WRAP_CPP(ORACLE_MOC_SRCS ${ORACLE_MOC_HDRS})
4141
INCLUDE_DIRECTORIES(
4242
../../core
4343
../../core/geometry
44+
../../core/metadata
4445
../../gui
4546
${CMAKE_BINARY_DIR}/src/core
4647
${CMAKE_BINARY_DIR}/src/gui

‎src/providers/ows/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ INCLUDE_DIRECTORIES (
1111
../../core
1212
../../core/geometry
1313
../../core/auth
14+
../../core/metadata
1415
../../gui
1516
../../gui/auth
1617
${CMAKE_CURRENT_BINARY_DIR}/../../ui

‎src/providers/postgres/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ INCLUDE_DIRECTORIES(
4141
../../core
4242
../../core/auth
4343
../../core/geometry
44+
../../core/metadata
4445
${CMAKE_BINARY_DIR}/src/core
4546
${CMAKE_BINARY_DIR}/src/gui
4647
)

‎src/providers/spatialite/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ INCLUDE_DIRECTORIES(SYSTEM
3636
INCLUDE_DIRECTORIES(
3737
../../core
3838
../../core/geometry
39+
../../core/metadata
3940
../../gui
4041
${CMAKE_CURRENT_BINARY_DIR}/../../ui
4142
${CMAKE_BINARY_DIR}/src/core

‎src/providers/virtual/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ INCLUDE_DIRECTORIES(
3232
../../core
3333
../../core/auth
3434
../../core/geometry
35+
../../core/metadata
3536
${CMAKE_BINARY_DIR}/src/core
3637
${CMAKE_BINARY_DIR}/src/gui
3738
)

‎src/providers/wcs/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ INCLUDE_DIRECTORIES(
2222
../../core/auth
2323
../../core/raster
2424
../../core/geometry
25+
../../core/metadata
2526
../../gui
2627
../../gui/auth
2728
../gdal

‎src/providers/wfs/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ INCLUDE_DIRECTORIES (
4141
../../core/auth
4242
../../core/geometry
4343
../../core/symbology-ng # needed by qgsvectorfilewriter.h
44+
../../core/metadata
4445
../../gui
4546
../../gui/auth
4647
${CMAKE_CURRENT_BINARY_DIR}/../../ui

‎src/providers/wms/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ INCLUDE_DIRECTORIES(
3232
../../core/auth
3333
../../core/geometry
3434
../../core/raster
35+
../../core/metadata
3536
../../gui
3637
../../gui/auth
3738
${CMAKE_CURRENT_BINARY_DIR}/../../ui

‎src/python/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ SET(QGISPYTHON_SRCS qgispython.cpp qgspythonutilsimpl.cpp)
33
INCLUDE_DIRECTORIES(
44
../core
55
../core/geometry
6+
../core/metadata
67
../core/raster
78
../gui
89
${CMAKE_BINARY_DIR}/src/core

‎src/server/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ INCLUDE_DIRECTORIES(
118118
../core/auth
119119
../core/dxf
120120
../core/geometry
121+
../core/metadata
121122
../core/raster
122123
../core/symbology-ng
123124
../core/composer

‎src/server/services/DummyService/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ INCLUDE_DIRECTORIES(
1919
${CMAKE_BINARY_DIR}/src/analysis
2020
${CMAKE_BINARY_DIR}/src/server
2121
${CMAKE_CURRENT_BINARY_DIR}
22-
../../../core ../../../core/geometry ../../../core/raster
22+
../../../core ../../../core/geometry ../../../core/metadata ../../../core/raster
2323
../..
2424
..
2525
.

‎src/server/services/wcs/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ INCLUDE_DIRECTORIES(
3232
../../../core
3333
../../../core/dxf
3434
../../../core/geometry
35+
../../../core/metadata
3536
../../../core/raster
3637
../../../core/symbology-ng
3738
../../../core/composer

‎src/server/services/wfs/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ INCLUDE_DIRECTORIES(
3333
../../../core
3434
../../../core/dxf
3535
../../../core/geometry
36+
../../../core/metadata
3637
../../../core/raster
3738
../../../core/symbology-ng
3839
../../../core/composer

‎src/server/services/wms/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ INCLUDE_DIRECTORIES(
4444
../../../core
4545
../../../core/dxf
4646
../../../core/geometry
47+
../../../core/metadata
4748
../../../core/raster
4849
../../../core/symbology-ng
4950
../../../core/composer

‎tests/bench/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ ADD_EXECUTABLE (qgis_bench MACOSX_BUNDLE WIN32 ${BENCH_SRCS} ${BENCH_MOC_SRCS} )
2020
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
2121
${CMAKE_CURRENT_SOURCE_DIR}/../../src/core
2222
${CMAKE_CURRENT_SOURCE_DIR}/../../src/core/geometry
23+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/core/metadata
2324
${CMAKE_CURRENT_SOURCE_DIR}/../../src/core/raster
2425
${CMAKE_CURRENT_BINARY_DIR}
2526
${CMAKE_BINARY_DIR}/src/core

‎tests/src/analysis/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
1010
${CMAKE_SOURCE_DIR}/src/core
1111
${CMAKE_SOURCE_DIR}/src/core/auth
1212
${CMAKE_SOURCE_DIR}/src/core/geometry
13+
${CMAKE_SOURCE_DIR}/src/core/metadata
1314
${CMAKE_SOURCE_DIR}/src/core/raster
1415
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
1516
${CMAKE_SOURCE_DIR}/src/analysis

0 commit comments

Comments
 (0)