diff --git a/SConstruct b/SConstruct index 99577df30..9df2c5f9f 100644 --- a/SConstruct +++ b/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') diff --git a/plugins/input/base/include/mapnik/datasource_plugin.hpp b/include/mapnik/datasource_plugin.hpp similarity index 100% rename from plugins/input/base/include/mapnik/datasource_plugin.hpp rename to include/mapnik/datasource_plugin.hpp diff --git a/plugins/input/CMakeLists.txt b/plugins/input/CMakeLists.txt index 8a1bcd5fd..c489db7fa 100644 --- a/plugins/input/CMakeLists.txt +++ b/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) diff --git a/plugins/input/base/CMakeLists.txt b/plugins/input/base/CMakeLists.txt deleted file mode 100644 index bf76706b8..000000000 --- a/plugins/input/base/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -add_library(datasource-base INTERFACE) -add_library(mapnik::datasource-base ALIAS datasource-base) - - -target_include_directories(datasource-base INTERFACE - $ - $ -) -target_link_libraries(datasource-base INTERFACE mapnik::core) - -mapnik_install(datasource-base) -install(DIRECTORY include/ DESTINATION "${MAPNIK_INCLUDE_DIR}") diff --git a/plugins/input/csv/CMakeLists.txt b/plugins/input/csv/CMakeLists.txt index bb2739dd1..165460bfb 100644 --- a/plugins/input/csv/CMakeLists.txt +++ b/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 ) diff --git a/plugins/input/gdal/CMakeLists.txt b/plugins/input/gdal/CMakeLists.txt index 440c545b3..bdf020f0b 100644 --- a/plugins/input/gdal/CMakeLists.txt +++ b/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} ) diff --git a/plugins/input/geobuf/CMakeLists.txt b/plugins/input/geobuf/CMakeLists.txt index 8bcf7b132..ca5bd60c4 100644 --- a/plugins/input/geobuf/CMakeLists.txt +++ b/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 ) diff --git a/plugins/input/geojson/CMakeLists.txt b/plugins/input/geojson/CMakeLists.txt index d6919a405..0126d7e8e 100644 --- a/plugins/input/geojson/CMakeLists.txt +++ b/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 ) diff --git a/plugins/input/ogr/CMakeLists.txt b/plugins/input/ogr/CMakeLists.txt index 0034d4684..8f1fe9aff 100644 --- a/plugins/input/ogr/CMakeLists.txt +++ b/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} ) diff --git a/plugins/input/pgraster/CMakeLists.txt b/plugins/input/pgraster/CMakeLists.txt index 21a58e733..156c47fd4 100644 --- a/plugins/input/pgraster/CMakeLists.txt +++ b/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 ) diff --git a/plugins/input/postgis/CMakeLists.txt b/plugins/input/postgis/CMakeLists.txt index e26e9b8c9..b1e88c2a0 100644 --- a/plugins/input/postgis/CMakeLists.txt +++ b/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 ) diff --git a/plugins/input/raster/CMakeLists.txt b/plugins/input/raster/CMakeLists.txt index ca3826a70..a8da14694 100644 --- a/plugins/input/raster/CMakeLists.txt +++ b/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 ) diff --git a/plugins/input/shape/CMakeLists.txt b/plugins/input/shape/CMakeLists.txt index 930d85f11..6132aeffb 100644 --- a/plugins/input/shape/CMakeLists.txt +++ b/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 ) diff --git a/plugins/input/sqlite/CMakeLists.txt b/plugins/input/sqlite/CMakeLists.txt index 5d93c3756..dd188f3db 100644 --- a/plugins/input/sqlite/CMakeLists.txt +++ b/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 ) diff --git a/plugins/input/topojson/CMakeLists.txt b/plugins/input/topojson/CMakeLists.txt index 03f885e44..3bf140d4c 100644 --- a/plugins/input/topojson/CMakeLists.txt +++ b/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 ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 65e649228..f080525b9 100644 --- a/src/CMakeLists.txt +++ b/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 && is build) then add link target