Skip to content

Commit

Permalink
include metadata headers in install (followup 3a965e6)
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed May 8, 2017
1 parent f004fc1 commit 1358822
Show file tree
Hide file tree
Showing 51 changed files with 54 additions and 6 deletions.
1 change: 1 addition & 0 deletions src/analysis/CMakeLists.txt
Expand Up @@ -162,6 +162,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/../core/geometry
${CMAKE_CURRENT_SOURCE_DIR}/../core/raster
${CMAKE_CURRENT_SOURCE_DIR}/../core/symbology-ng
${CMAKE_CURRENT_SOURCE_DIR}/../core/metadata
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/analysis
interpolation
Expand Down
1 change: 1 addition & 0 deletions src/app/CMakeLists.txt
Expand Up @@ -499,6 +499,7 @@ INCLUDE_DIRECTORIES(
../core/composer
../core/dxf
../core/geometry
../core/metadata
../core/layertree
../core/providers/memory
../core/raster
Expand Down
1 change: 1 addition & 0 deletions src/auth/basic/CMakeLists.txt
Expand Up @@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES (
../../core
../../core/auth
../../core/geometry
../../core/metadata
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
)
Expand Down
1 change: 1 addition & 0 deletions src/auth/identcert/CMakeLists.txt
Expand Up @@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES (
../../core
../../core/auth
../../core/geometry
../../core/metadata
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
)
Expand Down
1 change: 1 addition & 0 deletions src/auth/pkipaths/CMakeLists.txt
Expand Up @@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES (
../../core
../../core/auth
../../core/geometry
../../core/metadata
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
)
Expand Down
1 change: 1 addition & 0 deletions src/auth/pkipkcs12/CMakeLists.txt
Expand Up @@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES (
../../core
../../core/auth
../../core/geometry
../../core/metadata
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
)
Expand Down
5 changes: 4 additions & 1 deletion src/core/CMakeLists.txt
Expand Up @@ -338,7 +338,6 @@ SET(QGIS_CORE_SRCS
pal/pointset.cpp
pal/priorityqueue.cpp
pal/problem.cpp
pal/rtree.hpp
pal/util.cpp

raster/qgscliptominmaxenhancement.cpp
Expand Down Expand Up @@ -987,6 +986,9 @@ SET(QGIS_CORE_HDRS
fieldformatter/qgsrelationreferencefieldformatter.h
fieldformatter/qgsvaluemapfieldformatter.h
fieldformatter/qgsvaluerelationfieldformatter.h

metadata/qgslayermetadata.h
metadata/qgslayermetadatavalidator.h
)

IF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND)
Expand Down Expand Up @@ -1017,6 +1019,7 @@ INCLUDE_DIRECTORIES(
scalebar
symbology-ng
gps/qextserialport
metadata
)
INCLUDE_DIRECTORIES(SYSTEM
${SPATIALINDEX_INCLUDE_DIR}
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsmaplayer.h
Expand Up @@ -34,7 +34,7 @@
#include "qgscoordinatereferencesystem.h"
#include "qgsrendercontext.h"
#include "qgsmaplayerdependency.h"
#include "metadata/qgslayermetadata.h"
#include "qgslayermetadata.h"

class QgsDataProvider;
class QgsMapLayerLegend;
Expand Down
1 change: 1 addition & 0 deletions src/crssync/CMakeLists.txt
Expand Up @@ -3,6 +3,7 @@ ADD_EXECUTABLE(crssync main.cpp)
INCLUDE_DIRECTORIES(
../core
../core/geometry
../core/metadata
${CMAKE_BINARY_DIR}/src/core
)
INCLUDE_DIRECTORIES(SYSTEM
Expand Down
1 change: 1 addition & 0 deletions src/customwidgets/CMakeLists.txt
Expand Up @@ -103,6 +103,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../core/
${CMAKE_CURRENT_SOURCE_DIR}/../core/geometry
${CMAKE_CURRENT_SOURCE_DIR}/../core/metadata
${CMAKE_CURRENT_SOURCE_DIR}/../core/symbology-ng/
${CMAKE_CURRENT_SOURCE_DIR}/../gui/
${CMAKE_CURRENT_SOURCE_DIR}/../gui/attributetable/
Expand Down
1 change: 1 addition & 0 deletions src/gui/CMakeLists.txt
Expand Up @@ -753,6 +753,7 @@ INCLUDE_DIRECTORIES(
../core/scalebar
../core/symbology-ng
../core/effects
../core/metadata
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../ui
)
Expand Down
1 change: 1 addition & 0 deletions src/helpviewer/CMakeLists.txt
Expand Up @@ -55,6 +55,7 @@ ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE WIN32 ${HELP_SRCS} ${HELP_MOC_SRCS} ${HE
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../core
${CMAKE_CURRENT_SOURCE_DIR}/../core/geometry
${CMAKE_CURRENT_SOURCE_DIR}/../core/metadata
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/src/core
)
Expand Down
1 change: 1 addition & 0 deletions src/plugins/coordinate_capture/CMakeLists.txt
Expand Up @@ -32,6 +32,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}/../../ui/
../../core
../../core/geometry
../../core/metadata
../../core/raster
../../gui
..
Expand Down
1 change: 1 addition & 0 deletions src/plugins/evis/CMakeLists.txt
Expand Up @@ -62,6 +62,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/../../gui
${CMAKE_CURRENT_SOURCE_DIR}/../../core
${CMAKE_CURRENT_SOURCE_DIR}/../../core/geometry
${CMAKE_CURRENT_SOURCE_DIR}/../../core/metadata
${CMAKE_CURRENT_SOURCE_DIR}/../../core/raster
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_BINARY_DIR}/src/core
Expand Down
1 change: 1 addition & 0 deletions src/plugins/geometry_checker/CMakeLists.txt
Expand Up @@ -89,6 +89,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
../../core
../../core/geometry
../../core/metadata
../../core/symbology-ng
../../gui
..
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/georeferencer/CMakeLists.txt
Expand Up @@ -76,7 +76,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../../ui
../../core ../../core/geometry ../../core/raster ../../core/composer
../../core ../../core/geometry ../../core/metadata ../../core/raster ../../core/composer
../../gui ../../gui/editorwidgets ../../gui/layertree
..
${CMAKE_BINARY_DIR}/src/core
Expand Down
1 change: 1 addition & 0 deletions src/plugins/globe/CMakeLists.txt
Expand Up @@ -64,6 +64,7 @@ INCLUDE_DIRECTORIES(
${SIP_INCLUDE_DIR}
../../core
../../core/geometry
../../core/metadata
../../core/raster
../../core/symbology-ng
../../gui
Expand Down
1 change: 1 addition & 0 deletions src/plugins/gps_importer/CMakeLists.txt
Expand Up @@ -40,6 +40,7 @@ INCLUDE_DIRECTORIES(
${QEXTSERIALPORT_INCLUDE_DIR}
../../core
../../core/geometry
../../core/metadata
../../core/gps
../../gui
..
Expand Down
1 change: 1 addition & 0 deletions src/plugins/grass/CMakeLists.txt
Expand Up @@ -153,6 +153,7 @@ INCLUDE_DIRECTORIES(
../../app
../../core
../../core/geometry
../../core/metadata
../../core/layertree
../../core/raster
../../core/symbology-ng
Expand Down
1 change: 1 addition & 0 deletions src/plugins/offline_editing/CMakeLists.txt
Expand Up @@ -53,6 +53,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
../../core
../../core/geometry
../../core/metadata
../../core/layertree
../../core/raster
../../gui
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/plugin_template/CMakeLists.txt
Expand Up @@ -29,7 +29,7 @@ ADD_LIBRARY ([pluginlcasename]plugin MODULE ${[pluginlcasename]_SRCS} ${[pluginl

INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
../../core ../../core/geometry ../../core/raster
../../core ../../core/geometry ../../core/metadata ../../core/raster
../../gui
..
)
Expand Down
1 change: 1 addition & 0 deletions src/plugins/spatialquery/CMakeLists.txt
Expand Up @@ -40,6 +40,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}/../../ui/
../../core
../../core/geometry
../../core/metadata
../../core/raster
../../gui
..
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/topology/CMakeLists.txt
Expand Up @@ -44,7 +44,7 @@ INCLUDE_DIRECTORIES(SYSTEM
INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}/src/ui
${CMAKE_CURRENT_BINARY_DIR}
../../core ../../core/geometry ../../core/raster
../../core ../../core/geometry ../../core/metadata ../../core/raster
../../gui
..
${CMAKE_BINARY_DIR}/src/core
Expand Down
1 change: 1 addition & 0 deletions src/providers/arcgisrest/CMakeLists.txt
Expand Up @@ -3,6 +3,7 @@ INCLUDE_DIRECTORIES(
../../core/auth
../../core/geometry
../../core/raster
../../core/metadata
../../gui
../../gui/auth
${GEOS_INCLUDE_DIR}
Expand Down
1 change: 1 addition & 0 deletions src/providers/db2/CMakeLists.txt
Expand Up @@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
../../core
../../core/auth
../../core/geometry
../../core/metadata
../../gui
../../gui/auth
../../ui
Expand Down
1 change: 1 addition & 0 deletions src/providers/delimitedtext/CMakeLists.txt
Expand Up @@ -21,6 +21,7 @@ SET (DTEXT_MOC_HDRS
INCLUDE_DIRECTORIES(
../../core
../../core/geometry
../../core/metadata
../../gui
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
Expand Down
1 change: 1 addition & 0 deletions src/providers/gdal/CMakeLists.txt
Expand Up @@ -12,6 +12,7 @@ INCLUDE_DIRECTORIES (
../../core
../../core/raster
../../core/geometry
../../core/metadata
../../gui
${CMAKE_CURRENT_BINARY_DIR}/../../ui
${CMAKE_BINARY_DIR}/src/core
Expand Down
1 change: 1 addition & 0 deletions src/providers/gpx/CMakeLists.txt
Expand Up @@ -18,6 +18,7 @@ SET (GPX_MOC_HDRS
INCLUDE_DIRECTORIES(
../../core
../../core/geometry
../../core/metadata
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
)
Expand Down
1 change: 1 addition & 0 deletions src/providers/grass/CMakeLists.txt
Expand Up @@ -5,6 +5,7 @@
INCLUDE_DIRECTORIES(
../../core
../../core/geometry
../../core/metadata
../../core/raster
../../gui
${CMAKE_CURRENT_BINARY_DIR}
Expand Down
1 change: 1 addition & 0 deletions src/providers/mssql/CMakeLists.txt
Expand Up @@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
.
../../core
../../core/geometry
../../core/metadata
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
)
Expand Down
1 change: 1 addition & 0 deletions src/providers/ogr/CMakeLists.txt
Expand Up @@ -12,6 +12,7 @@ INCLUDE_DIRECTORIES(
.
../../core
../../core/geometry
../../core/metadata
${CMAKE_CURRENT_SOURCE_DIR}/../../core/symbology-ng
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
Expand Down
1 change: 1 addition & 0 deletions src/providers/oracle/CMakeLists.txt
Expand Up @@ -41,6 +41,7 @@ QT5_WRAP_CPP(ORACLE_MOC_SRCS ${ORACLE_MOC_HDRS})
INCLUDE_DIRECTORIES(
../../core
../../core/geometry
../../core/metadata
../../gui
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
Expand Down
1 change: 1 addition & 0 deletions src/providers/ows/CMakeLists.txt