From 36be4fe594cd768b911d137f73b15c823eb9898c Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 18 Mar 2021 15:35:55 +0100 Subject: [PATCH] renamed target mapnik::headers to mapnik::core --- CMakeLists.txt | 12 ++++++------ demo/c++/CMakeLists.txt | 2 +- demo/viewer/CMakeLists.txt | 2 +- deps/agg/CMakeLists.txt | 2 +- docs/cmake-usage.md | 2 +- plugins/input/csv/CMakeLists.txt | 2 +- plugins/input/gdal/CMakeLists.txt | 2 +- plugins/input/geobuf/CMakeLists.txt | 2 +- plugins/input/geojson/CMakeLists.txt | 2 +- plugins/input/ogr/CMakeLists.txt | 2 +- plugins/input/pgraster/CMakeLists.txt | 2 +- plugins/input/postgis/CMakeLists.txt | 2 +- plugins/input/raster/CMakeLists.txt | 2 +- plugins/input/shape/CMakeLists.txt | 2 +- plugins/input/sqlite/CMakeLists.txt | 2 +- plugins/input/topojson/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- src/json/CMakeLists.txt | 2 +- src/wkt/CMakeLists.txt | 2 +- test/CMakeLists.txt | 12 ++++++------ utils/geometry_to_wkb/CMakeLists.txt | 2 +- utils/mapnik-index/CMakeLists.txt | 2 +- utils/mapnik-render/CMakeLists.txt | 2 +- utils/ogrindex/CMakeLists.txt | 2 +- utils/pgsql2sqlite/CMakeLists.txt | 2 +- utils/shapeindex/CMakeLists.txt | 2 +- utils/svg2png/CMakeLists.txt | 2 +- 27 files changed, 37 insertions(+), 37 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a2b3c1471..6f4e3fd84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,10 +224,10 @@ if(NOT WIN32) list(APPEND MAPNIK_OPTIONAL_LIBS ${CMAKE_DL_LIBS}) endif() -add_library(headers INTERFACE) -add_library(mapnik::headers ALIAS headers) +add_library(mapnik-core INTERFACE) +add_library(mapnik::core ALIAS mapnik-core) -target_include_directories(headers INTERFACE +target_include_directories(mapnik-core INTERFACE $ $ $ @@ -237,7 +237,7 @@ target_include_directories(headers INTERFACE $ ${MAPNIK_OPTIONAL_LIBS_INCLUDE} ) -target_link_libraries(headers INTERFACE +target_link_libraries(mapnik-core INTERFACE Boost::headers Boost::regex Boost::filesystem @@ -248,9 +248,9 @@ target_link_libraries(headers INTERFACE harfbuzz::harfbuzz ${MAPNIK_OPTIONAL_LIBS} ) -target_compile_definitions(headers INTERFACE ${MAPNIK_COMPILE_DEFS}) +target_compile_definitions(mapnik-core INTERFACE ${MAPNIK_COMPILE_DEFS}) -install(TARGETS headers +install(TARGETS mapnik-core EXPORT MapnikTargets LIBRARY DESTINATION ${MAPNIK_LIB_DIR} ARCHIVE DESTINATION ${MAPNIK_ARCHIVE_DIR} diff --git a/demo/c++/CMakeLists.txt b/demo/c++/CMakeLists.txt index 48e83ce78..fece18e8a 100644 --- a/demo/c++/CMakeLists.txt +++ b/demo/c++/CMakeLists.txt @@ -2,7 +2,7 @@ project(mapnik-demo) add_executable(mapnik-demo rundemo.cpp) -target_link_libraries(mapnik-demo PRIVATE mapnik::headers mapnik::agg mapnik::mapnik) +target_link_libraries(mapnik-demo PRIVATE mapnik::core mapnik::agg mapnik::mapnik) install(TARGETS mapnik-demo LIBRARY DESTINATION ${MAPNIK_LIB_DIR} diff --git a/demo/viewer/CMakeLists.txt b/demo/viewer/CMakeLists.txt index c618b6fa5..5d71d1c40 100644 --- a/demo/viewer/CMakeLists.txt +++ b/demo/viewer/CMakeLists.txt @@ -29,7 +29,7 @@ set_target_properties(mapnik-viewer PROPERTIES target_link_libraries(mapnik-viewer PRIVATE Qt5::Widgets - mapnik::headers + mapnik::core mapnik::agg mapnik::mapnik ) diff --git a/deps/agg/CMakeLists.txt b/deps/agg/CMakeLists.txt index f54669c49..9cd0de942 100644 --- a/deps/agg/CMakeLists.txt +++ b/deps/agg/CMakeLists.txt @@ -7,7 +7,7 @@ target_include_directories(agg INTERFACE $ $ ) -target_link_libraries(agg INTERFACE mapnik::headers) +target_link_libraries(agg INTERFACE mapnik::core) install(TARGETS agg EXPORT MapnikTargets diff --git a/docs/cmake-usage.md b/docs/cmake-usage.md index e3d4e84a7..57de8f507 100644 --- a/docs/cmake-usage.md +++ b/docs/cmake-usage.md @@ -25,7 +25,7 @@ To use Mapnik in your project add the following lines to your CMakeLists.tzt. ``` find_package(mapnik CONFIG REQUIRED) [...] -target_link_libraries(mytarget ... mapnik::headers mapnik::mapnik) +target_link_libraries(mytarget ... mapnik::core mapnik::mapnik) ``` All mapnik executables and targets are exported within `MapnikTargets.cmake`. diff --git a/plugins/input/csv/CMakeLists.txt b/plugins/input/csv/CMakeLists.txt index 1c04d128b..677ac2538 100644 --- a/plugins/input/csv/CMakeLists.txt +++ b/plugins/input/csv/CMakeLists.txt @@ -10,7 +10,7 @@ add_library(input-csv SHARED add_library(mapnik::plugin::input::csv ALIAS input-csv) target_link_libraries(input-csv PRIVATE - mapnik::headers + mapnik::core mapnik::mapnik mapnik::wkt mapnik::json diff --git a/plugins/input/gdal/CMakeLists.txt b/plugins/input/gdal/CMakeLists.txt index 5c47cbb58..4b35fb814 100644 --- a/plugins/input/gdal/CMakeLists.txt +++ b/plugins/input/gdal/CMakeLists.txt @@ -10,7 +10,7 @@ add_library(mapnik::plugin::input::gdal ALIAS input-gdal) target_include_directories(input-gdal PRIVATE ${GDAL_INCLUDE_DIR}) target_link_libraries(input-gdal PRIVATE - mapnik::headers + mapnik::core mapnik::mapnik ${GDAL_LIBRARY} ) diff --git a/plugins/input/geobuf/CMakeLists.txt b/plugins/input/geobuf/CMakeLists.txt index 77c7ff743..73d39e14a 100644 --- a/plugins/input/geobuf/CMakeLists.txt +++ b/plugins/input/geobuf/CMakeLists.txt @@ -7,7 +7,7 @@ add_library(input-geobuf SHARED add_library(mapnik::plugin::input::geobuf ALIAS input-geobuf) target_link_libraries(input-geobuf PRIVATE - mapnik::headers + mapnik::core mapnik::mapnik ) set_target_properties(input-geobuf PROPERTIES PREFIX "") diff --git a/plugins/input/geojson/CMakeLists.txt b/plugins/input/geojson/CMakeLists.txt index 6d2c184f9..09da0e935 100644 --- a/plugins/input/geojson/CMakeLists.txt +++ b/plugins/input/geojson/CMakeLists.txt @@ -9,7 +9,7 @@ add_library(input-geojson SHARED add_library(mapnik::plugin::input::geojson ALIAS input-geojson) target_link_libraries(input-geojson PRIVATE - mapnik::headers + mapnik::core mapnik::mapnik mapnik::json ) diff --git a/plugins/input/ogr/CMakeLists.txt b/plugins/input/ogr/CMakeLists.txt index d03ac7329..3656e3a79 100644 --- a/plugins/input/ogr/CMakeLists.txt +++ b/plugins/input/ogr/CMakeLists.txt @@ -12,7 +12,7 @@ add_library(mapnik::plugin::input::ogr ALIAS input-ogr) target_include_directories(input-ogr PRIVATE ${GDAL_INCLUDE_DIR}) target_link_libraries(input-ogr PRIVATE - mapnik::headers + mapnik::core mapnik::mapnik ${GDAL_LIBRARY} ) diff --git a/plugins/input/pgraster/CMakeLists.txt b/plugins/input/pgraster/CMakeLists.txt index 3d837eb4f..fe6622cf0 100644 --- a/plugins/input/pgraster/CMakeLists.txt +++ b/plugins/input/pgraster/CMakeLists.txt @@ -11,7 +11,7 @@ add_library(mapnik::plugin::input::pgraster ALIAS input-pgraster) target_link_libraries(input-pgraster PRIVATE - mapnik::headers + mapnik::core mapnik::mapnik PostgreSQL::PostgreSQL ) diff --git a/plugins/input/postgis/CMakeLists.txt b/plugins/input/postgis/CMakeLists.txt index f07a45458..73113f282 100644 --- a/plugins/input/postgis/CMakeLists.txt +++ b/plugins/input/postgis/CMakeLists.txt @@ -9,7 +9,7 @@ add_library(input-postgis SHARED add_library(mapnik::plugin::input::postgis ALIAS input-postgis) target_link_libraries(input-postgis PRIVATE - mapnik::headers + mapnik::core mapnik::mapnik PostgreSQL::PostgreSQL ) diff --git a/plugins/input/raster/CMakeLists.txt b/plugins/input/raster/CMakeLists.txt index 50586425c..548a361a2 100644 --- a/plugins/input/raster/CMakeLists.txt +++ b/plugins/input/raster/CMakeLists.txt @@ -8,7 +8,7 @@ add_library(input-raster SHARED add_library(mapnik::plugin::input::raster ALIAS input-raster) target_link_libraries(input-raster PRIVATE - mapnik::headers + mapnik::core mapnik::mapnik ) diff --git a/plugins/input/shape/CMakeLists.txt b/plugins/input/shape/CMakeLists.txt index 8f90aff12..ed3a1f365 100644 --- a/plugins/input/shape/CMakeLists.txt +++ b/plugins/input/shape/CMakeLists.txt @@ -11,7 +11,7 @@ add_library(input-shape SHARED add_library(mapnik::plugin::input::shape ALIAS input-shape) target_link_libraries(input-shape PRIVATE - mapnik::headers + mapnik::core mapnik::mapnik ) diff --git a/plugins/input/sqlite/CMakeLists.txt b/plugins/input/sqlite/CMakeLists.txt index 4bbd0fc98..7be226609 100644 --- a/plugins/input/sqlite/CMakeLists.txt +++ b/plugins/input/sqlite/CMakeLists.txt @@ -9,7 +9,7 @@ add_library(input-sqlite SHARED add_library(mapnik::plugin::input::sqlite ALIAS input-sqlite) target_link_libraries(input-sqlite PRIVATE - mapnik::headers + mapnik::core mapnik::mapnik SQLite::SQLite3 ) diff --git a/plugins/input/topojson/CMakeLists.txt b/plugins/input/topojson/CMakeLists.txt index 78799a5d1..baefe69ee 100644 --- a/plugins/input/topojson/CMakeLists.txt +++ b/plugins/input/topojson/CMakeLists.txt @@ -7,7 +7,7 @@ add_library(input-topojson SHARED add_library(mapnik::plugin::input::topojson ALIAS input-topojson) target_link_libraries(input-topojson PRIVATE - mapnik::headers + mapnik::core mapnik::mapnik mapnik::json ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e98bc2c3b..7599ba4b4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -290,7 +290,7 @@ endif() target_compile_definitions(mapnik PRIVATE ${COMPILE_DEFS}) target_link_libraries(mapnik PRIVATE - mapnik::headers + mapnik::core mapnik::agg ) diff --git a/src/json/CMakeLists.txt b/src/json/CMakeLists.txt index b00651904..183b7c745 100644 --- a/src/json/CMakeLists.txt +++ b/src/json/CMakeLists.txt @@ -24,7 +24,7 @@ target_include_directories(json PRIVATE ${MAPBOX_GEOMETRY_INCLUDE_DIRS} ${MAPBOX_VARIANT_INCLUDE_DIRS} ) -target_link_libraries(json PRIVATE mapnik::headers ${ICUU_LIB}) +target_link_libraries(json PRIVATE mapnik::core ${ICUU_LIB}) install(TARGETS json EXPORT MapnikTargets diff --git a/src/wkt/CMakeLists.txt b/src/wkt/CMakeLists.txt index 2e3fc5fb9..35168f669 100644 --- a/src/wkt/CMakeLists.txt +++ b/src/wkt/CMakeLists.txt @@ -16,7 +16,7 @@ target_include_directories(wkt PRIVATE ${MAPBOX_GEOMETRY_INCLUDE_DIRS} ${MAPBOX_VARIANT_INCLUDE_DIRS} ) -target_link_libraries(wkt PRIVATE mapnik::headers) +target_link_libraries(wkt PRIVATE mapnik::core) install(TARGETS wkt EXPORT MapnikTargets diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e4b8eeef2..c5787b6ac 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -108,7 +108,7 @@ add_executable(mapnik-test-unit ) target_link_libraries(mapnik-test-unit PUBLIC Catch - mapnik::headers + mapnik::core mapnik::agg mapnik::mapnik mapnik::json @@ -118,7 +118,7 @@ target_link_libraries(mapnik-test-unit PUBLIC add_executable(agg_rasterizer_integer_overflow_test standalone/agg_rasterizer_integer_overflow_test.cpp) target_link_libraries(agg_rasterizer_integer_overflow_test PUBLIC Catch - mapnik::headers + mapnik::core mapnik::mapnik mapnik::agg mapnik::json @@ -127,7 +127,7 @@ target_link_libraries(agg_rasterizer_integer_overflow_test PUBLIC add_executable(datasource_registration_test standalone/datasource_registration_test.cpp) target_link_libraries(datasource_registration_test PUBLIC Catch - mapnik::headers + mapnik::core mapnik::mapnik mapnik::agg ) @@ -135,7 +135,7 @@ target_link_libraries(datasource_registration_test PUBLIC add_executable(font_registration_test standalone/font_registration_test.cpp) target_link_libraries(font_registration_test PUBLIC Catch - mapnik::headers + mapnik::core mapnik::mapnik mapnik::agg mapnik::json @@ -145,7 +145,7 @@ target_link_libraries(font_registration_test PUBLIC add_executable(map_xml_test standalone/map_xml_test.cpp) target_link_libraries(map_xml_test PUBLIC Catch - mapnik::headers + mapnik::core mapnik::mapnik mapnik::agg mapnik::json @@ -162,7 +162,7 @@ target_link_libraries( Catch Boost::program_options Boost::filesystem - mapnik::headers + mapnik::core mapnik::mapnik mapnik::agg ) diff --git a/utils/geometry_to_wkb/CMakeLists.txt b/utils/geometry_to_wkb/CMakeLists.txt index f706fd584..17d8e23cb 100644 --- a/utils/geometry_to_wkb/CMakeLists.txt +++ b/utils/geometry_to_wkb/CMakeLists.txt @@ -3,7 +3,7 @@ project(geometry_to_wkb) add_executable(geometry_to_wkb main.cpp) target_link_libraries(geometry_to_wkb PRIVATE - mapnik::headers + mapnik::core mapnik::mapnik ) diff --git a/utils/mapnik-index/CMakeLists.txt b/utils/mapnik-index/CMakeLists.txt index 22076f781..70123b379 100644 --- a/utils/mapnik-index/CMakeLists.txt +++ b/utils/mapnik-index/CMakeLists.txt @@ -9,7 +9,7 @@ add_executable(mapnik-index ../../plugins/input/csv/csv_utils.cpp # this project depends on this file ) target_link_libraries(mapnik-index PRIVATE - mapnik::headers + mapnik::core mapnik::mapnik mapnik::json mapnik::wkt diff --git a/utils/mapnik-render/CMakeLists.txt b/utils/mapnik-render/CMakeLists.txt index eed2e90a6..0dbc73f2a 100644 --- a/utils/mapnik-render/CMakeLists.txt +++ b/utils/mapnik-render/CMakeLists.txt @@ -5,7 +5,7 @@ find_package(Boost 1.74 REQUIRED COMPONENTS program_options) add_executable(mapnik-render mapnik-render.cpp) target_link_libraries(mapnik-render PRIVATE - mapnik::headers + mapnik::core mapnik::mapnik Boost::program_options ) diff --git a/utils/ogrindex/CMakeLists.txt b/utils/ogrindex/CMakeLists.txt index 8e9eed31a..ad9c12e41 100644 --- a/utils/ogrindex/CMakeLists.txt +++ b/utils/ogrindex/CMakeLists.txt @@ -3,7 +3,7 @@ project(ogrindex) add_executable(ogrindex ogrindex.cpp) -target_link_libraries(ogrindex PRIVATE mapnik::headers mapnik::mapnik) +target_link_libraries(ogrindex PRIVATE mapnik::core mapnik::mapnik) install(TARGETS ogrindex EXPORT MapnikTargets diff --git a/utils/pgsql2sqlite/CMakeLists.txt b/utils/pgsql2sqlite/CMakeLists.txt index c98427ec9..d57046bee 100644 --- a/utils/pgsql2sqlite/CMakeLists.txt +++ b/utils/pgsql2sqlite/CMakeLists.txt @@ -13,7 +13,7 @@ target_link_libraries(pgsql2sqlite PRIVATE SQLite::SQLite3 PostgreSQL::PostgreSQL Boost::program_options - mapnik::headers + mapnik::core mapnik::mapnik ) diff --git a/utils/shapeindex/CMakeLists.txt b/utils/shapeindex/CMakeLists.txt index 969c86817..79a9f24ff 100644 --- a/utils/shapeindex/CMakeLists.txt +++ b/utils/shapeindex/CMakeLists.txt @@ -9,7 +9,7 @@ add_executable(shapeindex target_include_directories(shapeindex PRIVATE ../../plugins/input/shape) target_link_libraries(shapeindex PRIVATE Boost::program_options - mapnik::headers + mapnik::core mapnik::mapnik ) install(TARGETS shapeindex diff --git a/utils/svg2png/CMakeLists.txt b/utils/svg2png/CMakeLists.txt index 015de5c3d..6f1a52eab 100644 --- a/utils/svg2png/CMakeLists.txt +++ b/utils/svg2png/CMakeLists.txt @@ -8,7 +8,7 @@ add_executable(svg2png target_link_libraries(svg2png PRIVATE Boost::program_options - mapnik::headers + mapnik::core mapnik::mapnik mapnik::agg )