Merge branch 'master' into svg-group-render

SConstruct

@@ -1879,7 +1879,6 @@ if not preconfigured:
     env.Prepend(CPPPATH = '#deps/mapbox/geometry/include')
     env.Prepend(CPPPATH = '#deps/mapbox/protozero/include')
     env.Prepend(CPPPATH = '#deps/mapbox/polylabel/include')
-    env.Prepend(CPPPATH = '#plugins/input/base/include')
     # prepend deps dir for auxillary headers
     env.Prepend(CPPPATH = '#deps')
 

include/mapnik/wkb.hpp

@@ -28,6 +28,9 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/util/noncopyable.hpp>
 
+// stl
+#include <cstdint>
+
 namespace mapnik {
 
 /*!

plugins/input/CMakeLists.txt

@@ -21,9 +21,6 @@ macro(add_plugin_target plugin_target output_name)
     mapnik_install_plugin(${plugin_target})
 endmacro()
 
-
-add_subdirectory(base)
-
 # add a list with all build plugins so the copy dependencies command can wait for all build events
 set(m_build_plugins "")
 if(USE_PLUGIN_INPUT_CSV)

plugins/input/base/CMakeLists.txt

@@ -1,12 +0,0 @@
-add_library(datasource-base INTERFACE)
-add_library(mapnik::datasource-base ALIAS datasource-base)
-
-
-target_include_directories(datasource-base INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
-)
-target_link_libraries(datasource-base INTERFACE mapnik::core)
-
-mapnik_install(datasource-base)
-install(DIRECTORY include/ DESTINATION "${MAPNIK_INCLUDE_DIR}")

plugins/input/csv/CMakeLists.txt

@@ -11,5 +11,4 @@ target_link_libraries(input-csv ${_plugin_visibility}
     mapnik::mapnik
     mapnik::wkt
     mapnik::json
-    mapnik::datasource-base
 )

plugins/input/gdal/CMakeLists.txt

@@ -8,6 +8,5 @@ target_sources(input-gdal ${_plugin_visibility}
 target_include_directories(input-gdal ${_plugin_visibility} ${GDAL_INCLUDE_DIRS})
 target_link_libraries(input-gdal ${_plugin_visibility}
     mapnik::mapnik
-    mapnik::datasource-base
     ${GDAL_LIBRARIES}
 )

plugins/input/geobuf/CMakeLists.txt

@@ -6,5 +6,4 @@ target_sources(input-geobuf ${_plugin_visibility}
 )
 target_link_libraries(input-geobuf ${_plugin_visibility}
     mapnik::mapnik
-    mapnik::datasource-base
 )

plugins/input/geojson/CMakeLists.txt

@@ -8,5 +8,4 @@ target_sources(input-geojson ${_plugin_visibility}
 target_link_libraries(input-geojson ${_plugin_visibility}
     mapnik::mapnik
     mapnik::json
-    mapnik::datasource-base
 )

plugins/input/ogr/CMakeLists.txt

@@ -10,6 +10,5 @@ target_sources(input-ogr ${_plugin_visibility}
 target_include_directories(input-ogr ${_plugin_visibility} ${GDAL_INCLUDE_DIRS})
 target_link_libraries(input-ogr ${_plugin_visibility}
     mapnik::mapnik
-    mapnik::datasource-base
     ${GDAL_LIBRARIES}
 )

plugins/input/pgraster/CMakeLists.txt

@@ -8,6 +8,5 @@ target_sources(input-pgraster ${_plugin_visibility}
 )
 target_link_libraries(input-pgraster ${_plugin_visibility}
     mapnik::mapnik
-    mapnik::datasource-base
     PostgreSQL::PostgreSQL
 )

plugins/input/postgis/CMakeLists.txt

@@ -7,6 +7,5 @@ target_sources(input-postgis ${_plugin_visibility}
 )
 target_link_libraries(input-postgis ${_plugin_visibility}
     mapnik::mapnik
-    mapnik::datasource-base
     PostgreSQL::PostgreSQL
 )

plugins/input/raster/CMakeLists.txt

@@ -6,5 +6,4 @@ target_sources(input-raster ${_plugin_visibility}
 )
 target_link_libraries(input-raster ${_plugin_visibility}
     mapnik::mapnik
-    mapnik::datasource-base
 )

plugins/input/shape/CMakeLists.txt

@@ -9,5 +9,4 @@ target_sources(input-shape ${_plugin_visibility}
 )
 target_link_libraries(input-shape ${_plugin_visibility}
     mapnik::mapnik
-    mapnik::datasource-base
 )

plugins/input/sqlite/CMakeLists.txt

@@ -7,6 +7,5 @@ target_sources(input-sqlite ${_plugin_visibility}
 )
 target_link_libraries(input-sqlite ${_plugin_visibility}
     mapnik::mapnik
-    mapnik::datasource-base
     SQLite::SQLite3
 )

plugins/input/topojson/CMakeLists.txt

@@ -6,5 +6,4 @@ target_sources(input-topojson ${_plugin_visibility}
 target_link_libraries(input-topojson ${_plugin_visibility}
     mapnik::mapnik
     mapnik::json
-    mapnik::datasource-base
 )

src/CMakeLists.txt

@@ -6,7 +6,7 @@ if(BUILD_SHARED_LIBS)
     target_compile_definitions(mapnik PRIVATE MAPNIK_EXPORTS)
 endif()
 
-target_link_libraries(mapnik PUBLIC mapnik::core mapnik::datasource-base)
+target_link_libraries(mapnik PUBLIC mapnik::core)
 target_link_libraries(mapnik PRIVATE
     mapnik::agg
     # expr: if(BUILD_SHARED_PLUGINS == OFF && <target> is build) then add link target