Move the generated code for MVT to a directory in external/

qgis · Mar 26, 2020 · f43bd8c · f43bd8c
1 parent 617db59
commit f43bd8c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/external/mapbox-vector-tile/README.md b/external/mapbox-vector-tile/README.md
@@ -0,0 +1,15 @@
+
+The .pb.cc and .pb.h are generated by 'protoc' tool and got copied here from https://github.com/TimSC/mbtiles-cpp
+
+
+Update pbf files
+----------------
+
+To update the protobuf files, get vector_tile.proto from https://github.com/mapbox/vector-tile-spec, remove the line "option optimize_for = LITE_RUNTIME;", then
+
+    mkdir vector_tile21
+
+    protoc vector_tile.proto --cpp_out vector_tile21
+
+protobuf lite is avoided because it doesn't contain SerializeToOstream functionality.
+
diff --git a/src/core/vectortile/vector_tile.pb.cc → ...rnal/mapbox-vector-tile/vector_tile.pb.cc b/src/core/vectortile/vector_tile.pb.cc → ...rnal/mapbox-vector-tile/vector_tile.pb.cc
diff --git a/src/core/vectortile/vector_tile.pb.h → external/mapbox-vector-tile/vector_tile.pb.h b/src/core/vectortile/vector_tile.pb.h → external/mapbox-vector-tile/vector_tile.pb.h
diff --git a/scripts/astyle.sh b/scripts/astyle.sh
@@ -105,7 +105,7 @@ astyleit() {
 
 for f in "$@"; do
 	case "$f" in
-                src/plugins/grass/qtermwidget/*|external/o2/*|external/qt-unix-signals/*|external/rtree/*|external/astyle/*|external/kdbush/*|external/poly2tri/*|external/wintoast/*|external/qt3dextra-headers/*|external/meshOptimizer/*|python/ext-libs/*|ui_*.py|*.astyle|tests/testdata/*|editors/*|src/core/vectortile/*.pb.*)
+                src/plugins/grass/qtermwidget/*|external/o2/*|external/qt-unix-signals/*|external/rtree/*|external/astyle/*|external/kdbush/*|external/poly2tri/*|external/wintoast/*|external/qt3dextra-headers/*|external/meshOptimizer/*|python/ext-libs/*|ui_*.py|*.astyle|tests/testdata/*|editors/*)
 			echo -ne "$f skipped $elcr"
 			continue
 			;;

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -18,6 +18,8 @@ SET(QGIS_CORE_SRCS
   ${CMAKE_SOURCE_DIR}/external/poly2tri/sweep/sweep.cc
   ${CMAKE_SOURCE_DIR}/external/meshOptimizer/simplifier.cpp
 
+  ${CMAKE_SOURCE_DIR}/external/mapbox-vector-tile/vector_tile.pb.cc
+
   callouts/qgscallout.cpp
   callouts/qgscalloutsregistry.cpp
 
@@ -643,7 +645,6 @@ SET(QGIS_CORE_SRCS
   vectortile/qgsvectortileloader.cpp
   vectortile/qgsvectortilemvtdecoder.cpp
   vectortile/qgsvectortileutils.cpp
-  vectortile/vector_tile.pb.cc
 
   ${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp
 
@@ -1436,6 +1437,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/external/poly2tri
   ${CMAKE_SOURCE_DIR}/external/rtree/include
   ${CMAKE_SOURCE_DIR}/external/meshOptimizer
+  ${CMAKE_SOURCE_DIR}/external/mapbox-vector-tile
 )
 
 INCLUDE_DIRECTORIES(SYSTEM