include metadata headers in install (followup 3a965e6)

qgis · May 8, 2017 · 1358822
1 parent f004fc1
commit 1358822
Show file tree

Hide file tree

Showing 51 changed files with 54 additions and 6 deletions.
diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -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

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -499,6 +499,7 @@ INCLUDE_DIRECTORIES(
   ../core/composer
   ../core/dxf
   ../core/geometry
+  ../core/metadata
   ../core/layertree
   ../core/providers/memory
   ../core/raster

diff --git a/src/auth/basic/CMakeLists.txt b/src/auth/basic/CMakeLists.txt
@@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES (
   ../../core
   ../../core/auth
   ../../core/geometry
+  ../../core/metadata
   ${CMAKE_BINARY_DIR}/src/core
   ${CMAKE_BINARY_DIR}/src/gui
 )

diff --git a/src/auth/identcert/CMakeLists.txt b/src/auth/identcert/CMakeLists.txt
@@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES (
   ../../core
   ../../core/auth
   ../../core/geometry
+  ../../core/metadata
   ${CMAKE_BINARY_DIR}/src/core
   ${CMAKE_BINARY_DIR}/src/gui
 )

diff --git a/src/auth/pkipaths/CMakeLists.txt b/src/auth/pkipaths/CMakeLists.txt
@@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES (
   ../../core
   ../../core/auth
   ../../core/geometry
+  ../../core/metadata
   ${CMAKE_BINARY_DIR}/src/core
   ${CMAKE_BINARY_DIR}/src/gui
 )

diff --git a/src/auth/pkipkcs12/CMakeLists.txt b/src/auth/pkipkcs12/CMakeLists.txt
@@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES (
   ../../core
   ../../core/auth
   ../../core/geometry
+  ../../core/metadata
   ${CMAKE_BINARY_DIR}/src/core
   ${CMAKE_BINARY_DIR}/src/gui
 )

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -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
@@ -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)
@@ -1017,6 +1019,7 @@ INCLUDE_DIRECTORIES(
   scalebar
   symbology-ng
   gps/qextserialport
+  metadata
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${SPATIALINDEX_INCLUDE_DIR}

diff --git a/src/core/qgsmaplayer.h b/src/core/qgsmaplayer.h
@@ -34,7 +34,7 @@
 #include "qgscoordinatereferencesystem.h"
 #include "qgsrendercontext.h"
 #include "qgsmaplayerdependency.h"
-#include "metadata/qgslayermetadata.h"
+#include "qgslayermetadata.h"
 
 class QgsDataProvider;
 class QgsMapLayerLegend;

diff --git a/src/crssync/CMakeLists.txt b/src/crssync/CMakeLists.txt
@@ -3,6 +3,7 @@ ADD_EXECUTABLE(crssync main.cpp)
 INCLUDE_DIRECTORIES(
   ../core
   ../core/geometry
+  ../core/metadata
   ${CMAKE_BINARY_DIR}/src/core
 )
 INCLUDE_DIRECTORIES(SYSTEM

diff --git a/src/customwidgets/CMakeLists.txt b/src/customwidgets/CMakeLists.txt
@@ -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/

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -753,6 +753,7 @@ INCLUDE_DIRECTORIES(
   ../core/scalebar
   ../core/symbology-ng
   ../core/effects
+  ../core/metadata
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/../ui
 )

diff --git a/src/helpviewer/CMakeLists.txt b/src/helpviewer/CMakeLists.txt
@@ -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
 )

diff --git a/src/plugins/coordinate_capture/CMakeLists.txt b/src/plugins/coordinate_capture/CMakeLists.txt
@@ -32,6 +32,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}/../../ui/
   ../../core
   ../../core/geometry
+  ../../core/metadata
   ../../core/raster
   ../../gui
   ..

diff --git a/src/plugins/evis/CMakeLists.txt b/src/plugins/evis/CMakeLists.txt
@@ -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

diff --git a/src/plugins/geometry_checker/CMakeLists.txt b/src/plugins/geometry_checker/CMakeLists.txt
@@ -89,6 +89,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}
   ../../core
   ../../core/geometry
+  ../../core/metadata
   ../../core/symbology-ng
   ../../gui
   ..

diff --git a/src/plugins/georeferencer/CMakeLists.txt b/src/plugins/georeferencer/CMakeLists.txt
@@ -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

diff --git a/src/plugins/globe/CMakeLists.txt b/src/plugins/globe/CMakeLists.txt
@@ -64,6 +64,7 @@ INCLUDE_DIRECTORIES(
   ${SIP_INCLUDE_DIR}
   ../../core
   ../../core/geometry
+  ../../core/metadata
   ../../core/raster
   ../../core/symbology-ng
   ../../gui

diff --git a/src/plugins/gps_importer/CMakeLists.txt b/src/plugins/gps_importer/CMakeLists.txt
@@ -40,6 +40,7 @@ INCLUDE_DIRECTORIES(
   ${QEXTSERIALPORT_INCLUDE_DIR}
   ../../core
   ../../core/geometry
+  ../../core/metadata
   ../../core/gps
   ../../gui
   ..

diff --git a/src/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt
@@ -153,6 +153,7 @@ INCLUDE_DIRECTORIES(
   ../../app
   ../../core
   ../../core/geometry
+  ../../core/metadata
   ../../core/layertree
   ../../core/raster
   ../../core/symbology-ng

diff --git a/src/plugins/offline_editing/CMakeLists.txt b/src/plugins/offline_editing/CMakeLists.txt
@@ -53,6 +53,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}
   ../../core
   ../../core/geometry
+  ../../core/metadata
   ../../core/layertree
   ../../core/raster
   ../../gui

diff --git a/src/plugins/plugin_template/CMakeLists.txt b/src/plugins/plugin_template/CMakeLists.txt
@@ -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
      ..
 )

diff --git a/src/plugins/spatialquery/CMakeLists.txt b/src/plugins/spatialquery/CMakeLists.txt
@@ -40,6 +40,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}/../../ui/
   ../../core
   ../../core/geometry
+  ../../core/metadata
   ../../core/raster
   ../../gui
   ..

diff --git a/src/plugins/topology/CMakeLists.txt b/src/plugins/topology/CMakeLists.txt
@@ -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

diff --git a/src/providers/arcgisrest/CMakeLists.txt b/src/providers/arcgisrest/CMakeLists.txt
@@ -3,6 +3,7 @@ INCLUDE_DIRECTORIES(
   ../../core/auth
   ../../core/geometry
   ../../core/raster
+  ../../core/metadata
   ../../gui
   ../../gui/auth
   ${GEOS_INCLUDE_DIR}

diff --git a/src/providers/db2/CMakeLists.txt b/src/providers/db2/CMakeLists.txt
@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
   ../../core
   ../../core/auth  
   ../../core/geometry
+  ../../core/metadata
   ../../gui
   ../../gui/auth
   ../../ui  

diff --git a/src/providers/delimitedtext/CMakeLists.txt b/src/providers/delimitedtext/CMakeLists.txt
@@ -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

diff --git a/src/providers/gdal/CMakeLists.txt b/src/providers/gdal/CMakeLists.txt
@@ -12,6 +12,7 @@ INCLUDE_DIRECTORIES (
   ../../core
   ../../core/raster
   ../../core/geometry
+  ../../core/metadata
   ../../gui
   ${CMAKE_CURRENT_BINARY_DIR}/../../ui
   ${CMAKE_BINARY_DIR}/src/core

diff --git a/src/providers/gpx/CMakeLists.txt b/src/providers/gpx/CMakeLists.txt
@@ -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
 )

diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt
@@ -5,6 +5,7 @@
 INCLUDE_DIRECTORIES(
   ../../core
   ../../core/geometry
+  ../../core/metadata
   ../../core/raster
   ../../gui
   ${CMAKE_CURRENT_BINARY_DIR}

diff --git a/src/providers/mssql/CMakeLists.txt b/src/providers/mssql/CMakeLists.txt
@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
   .
   ../../core
   ../../core/geometry
+  ../../core/metadata
   ${CMAKE_BINARY_DIR}/src/core
   ${CMAKE_BINARY_DIR}/src/gui
 )

diff --git a/src/providers/ogr/CMakeLists.txt b/src/providers/ogr/CMakeLists.txt
@@ -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

diff --git a/src/providers/oracle/CMakeLists.txt b/src/providers/oracle/CMakeLists.txt
@@ -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

diff --git a/src/providers/ows/CMakeLists.txt b/src/providers/ows/CMakeLists.txt
@@ -11,6 +11,7 @@ INCLUDE_DIRECTORIES (
   ../../core
   ../../core/geometry
   ../../core/auth
+  ../../core/metadata
   ../../gui
   ../../gui/auth
   ${CMAKE_CURRENT_BINARY_DIR}/../../ui

diff --git a/src/providers/postgres/CMakeLists.txt b/src/providers/postgres/CMakeLists.txt
@@ -41,6 +41,7 @@ INCLUDE_DIRECTORIES(
   ../../core
   ../../core/auth
   ../../core/geometry
+  ../../core/metadata
   ${CMAKE_BINARY_DIR}/src/core
   ${CMAKE_BINARY_DIR}/src/gui
 )

diff --git a/src/providers/spatialite/CMakeLists.txt b/src/providers/spatialite/CMakeLists.txt
@@ -36,6 +36,7 @@ INCLUDE_DIRECTORIES(SYSTEM
 INCLUDE_DIRECTORIES(
   ../../core
   ../../core/geometry
+  ../../core/metadata
   ../../gui
   ${CMAKE_CURRENT_BINARY_DIR}/../../ui
   ${CMAKE_BINARY_DIR}/src/core

diff --git a/src/providers/virtual/CMakeLists.txt b/src/providers/virtual/CMakeLists.txt
@@ -32,6 +32,7 @@ INCLUDE_DIRECTORIES(
   ../../core
   ../../core/auth
   ../../core/geometry
+  ../../core/metadata
   ${CMAKE_BINARY_DIR}/src/core
   ${CMAKE_BINARY_DIR}/src/gui
 )

diff --git a/src/providers/wcs/CMakeLists.txt b/src/providers/wcs/CMakeLists.txt