sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

renamed target mapnik::headers to mapnik::core

Browse source
This commit is contained in:
Mathis Logemann 2021-03-18 15:35:55 +01:00
parent 4604aee202
commit 36be4fe594
27 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -224,10 +224,10 @@ if(NOT WIN32)
list(APPEND MAPNIK_OPTIONAL_LIBS ${CMAKE_DL_LIBS}) list(APPEND MAPNIK_OPTIONAL_LIBS ${CMAKE_DL_LIBS})
endif() endif()
add_library(headers INTERFACE) add_library(mapnik-core INTERFACE)
add_library(mapnik::headers ALIAS headers) add_library(mapnik::core ALIAS mapnik-core)
target_include_directories(headers INTERFACE target_include_directories(mapnik-core INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${MAPBOX_GEOMETRY_INCLUDE_DIRS}> $<BUILD_INTERFACE:${MAPBOX_GEOMETRY_INCLUDE_DIRS}>
$<BUILD_INTERFACE:${MAPBOX_POLYLABEL_INCLUDE_DIRS}> $<BUILD_INTERFACE:${MAPBOX_POLYLABEL_INCLUDE_DIRS}>
@ -237,7 +237,7 @@ target_include_directories(headers INTERFACE
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
${MAPNIK_OPTIONAL_LIBS_INCLUDE} ${MAPNIK_OPTIONAL_LIBS_INCLUDE}
) )
target_link_libraries(headers INTERFACE target_link_libraries(mapnik-core INTERFACE
Boost::headers Boost::headers
Boost::regex Boost::regex
Boost::filesystem Boost::filesystem
@ -248,9 +248,9 @@ target_link_libraries(headers INTERFACE
harfbuzz::harfbuzz harfbuzz::harfbuzz
${MAPNIK_OPTIONAL_LIBS} ${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 EXPORT MapnikTargets
LIBRARY DESTINATION ${MAPNIK_LIB_DIR} LIBRARY DESTINATION ${MAPNIK_LIB_DIR}
ARCHIVE DESTINATION ${MAPNIK_ARCHIVE_DIR} ARCHIVE DESTINATION ${MAPNIK_ARCHIVE_DIR}

2
demo/c++/CMakeLists.txt
View file

@ -2,7 +2,7 @@ project(mapnik-demo)
add_executable(mapnik-demo rundemo.cpp) 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 install(TARGETS mapnik-demo
LIBRARY DESTINATION ${MAPNIK_LIB_DIR} LIBRARY DESTINATION ${MAPNIK_LIB_DIR}

2
demo/viewer/CMakeLists.txt
View file

@ -29,7 +29,7 @@ set_target_properties(mapnik-viewer PROPERTIES
target_link_libraries(mapnik-viewer PRIVATE target_link_libraries(mapnik-viewer PRIVATE
Qt5::Widgets Qt5::Widgets
mapnik::headers mapnik::core
mapnik::agg mapnik::agg
mapnik::mapnik mapnik::mapnik
) )

2
deps/agg/CMakeLists.txt vendored
View file

@ -7,7 +7,7 @@ target_include_directories(agg INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
) )
target_link_libraries(agg INTERFACE mapnik::headers) target_link_libraries(agg INTERFACE mapnik::core)
install(TARGETS agg install(TARGETS agg
EXPORT MapnikTargets EXPORT MapnikTargets

2
docs/cmake-usage.md
View file

@ -25,7 +25,7 @@ To use Mapnik in your project add the following lines to your CMakeLists.tzt.
``` ```
find_package(mapnik CONFIG REQUIRED) 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`. All mapnik executables and targets are exported within `MapnikTargets.cmake`.

2
plugins/input/csv/CMakeLists.txt
View file

@ -10,7 +10,7 @@ add_library(input-csv SHARED
add_library(mapnik::plugin::input::csv ALIAS input-csv) add_library(mapnik::plugin::input::csv ALIAS input-csv)
target_link_libraries(input-csv PRIVATE target_link_libraries(input-csv PRIVATE
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
mapnik::wkt mapnik::wkt
mapnik::json mapnik::json

2
plugins/input/gdal/CMakeLists.txt
View file

@ -10,7 +10,7 @@ add_library(mapnik::plugin::input::gdal ALIAS input-gdal)
target_include_directories(input-gdal PRIVATE ${GDAL_INCLUDE_DIR}) target_include_directories(input-gdal PRIVATE ${GDAL_INCLUDE_DIR})
target_link_libraries(input-gdal PRIVATE target_link_libraries(input-gdal PRIVATE
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
${GDAL_LIBRARY} ${GDAL_LIBRARY}
) )

2
plugins/input/geobuf/CMakeLists.txt
View file

@ -7,7 +7,7 @@ add_library(input-geobuf SHARED
add_library(mapnik::plugin::input::geobuf ALIAS input-geobuf) add_library(mapnik::plugin::input::geobuf ALIAS input-geobuf)
target_link_libraries(input-geobuf PRIVATE target_link_libraries(input-geobuf PRIVATE
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
) )
set_target_properties(input-geobuf PROPERTIES PREFIX "") set_target_properties(input-geobuf PROPERTIES PREFIX "")

2
plugins/input/geojson/CMakeLists.txt
View file

@ -9,7 +9,7 @@ add_library(input-geojson SHARED
add_library(mapnik::plugin::input::geojson ALIAS input-geojson) add_library(mapnik::plugin::input::geojson ALIAS input-geojson)
target_link_libraries(input-geojson PRIVATE target_link_libraries(input-geojson PRIVATE
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
mapnik::json mapnik::json
) )

2
plugins/input/ogr/CMakeLists.txt
View file

@ -12,7 +12,7 @@ add_library(mapnik::plugin::input::ogr ALIAS input-ogr)
target_include_directories(input-ogr PRIVATE ${GDAL_INCLUDE_DIR}) target_include_directories(input-ogr PRIVATE ${GDAL_INCLUDE_DIR})
target_link_libraries(input-ogr PRIVATE target_link_libraries(input-ogr PRIVATE
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
${GDAL_LIBRARY} ${GDAL_LIBRARY}
) )

2
plugins/input/pgraster/CMakeLists.txt
View file

@ -11,7 +11,7 @@ add_library(mapnik::plugin::input::pgraster ALIAS input-pgraster)
target_link_libraries(input-pgraster PRIVATE target_link_libraries(input-pgraster PRIVATE
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
PostgreSQL::PostgreSQL PostgreSQL::PostgreSQL
) )

2
plugins/input/postgis/CMakeLists.txt
View file

@ -9,7 +9,7 @@ add_library(input-postgis SHARED
add_library(mapnik::plugin::input::postgis ALIAS input-postgis) add_library(mapnik::plugin::input::postgis ALIAS input-postgis)
target_link_libraries(input-postgis PRIVATE target_link_libraries(input-postgis PRIVATE
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
PostgreSQL::PostgreSQL PostgreSQL::PostgreSQL
) )

2
plugins/input/raster/CMakeLists.txt
View file

@ -8,7 +8,7 @@ add_library(input-raster SHARED
add_library(mapnik::plugin::input::raster ALIAS input-raster) add_library(mapnik::plugin::input::raster ALIAS input-raster)
target_link_libraries(input-raster PRIVATE target_link_libraries(input-raster PRIVATE
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
) )

2
plugins/input/shape/CMakeLists.txt
View file

@ -11,7 +11,7 @@ add_library(input-shape SHARED
add_library(mapnik::plugin::input::shape ALIAS input-shape) add_library(mapnik::plugin::input::shape ALIAS input-shape)
target_link_libraries(input-shape PRIVATE target_link_libraries(input-shape PRIVATE
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
) )

2
plugins/input/sqlite/CMakeLists.txt
View file

@ -9,7 +9,7 @@ add_library(input-sqlite SHARED
add_library(mapnik::plugin::input::sqlite ALIAS input-sqlite) add_library(mapnik::plugin::input::sqlite ALIAS input-sqlite)
target_link_libraries(input-sqlite PRIVATE target_link_libraries(input-sqlite PRIVATE
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
SQLite::SQLite3 SQLite::SQLite3
) )

2
plugins/input/topojson/CMakeLists.txt
View file

@ -7,7 +7,7 @@ add_library(input-topojson SHARED
add_library(mapnik::plugin::input::topojson ALIAS input-topojson) add_library(mapnik::plugin::input::topojson ALIAS input-topojson)
target_link_libraries(input-topojson PRIVATE target_link_libraries(input-topojson PRIVATE
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
mapnik::json mapnik::json
) )

2
src/CMakeLists.txt
View file

@ -290,7 +290,7 @@ endif()
target_compile_definitions(mapnik PRIVATE ${COMPILE_DEFS}) target_compile_definitions(mapnik PRIVATE ${COMPILE_DEFS})
target_link_libraries(mapnik PRIVATE target_link_libraries(mapnik PRIVATE
mapnik::headers mapnik::core
mapnik::agg mapnik::agg
) )

2
src/json/CMakeLists.txt
View file

@ -24,7 +24,7 @@ target_include_directories(json PRIVATE
${MAPBOX_GEOMETRY_INCLUDE_DIRS} ${MAPBOX_GEOMETRY_INCLUDE_DIRS}
${MAPBOX_VARIANT_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 install(TARGETS json
EXPORT MapnikTargets EXPORT MapnikTargets

2
src/wkt/CMakeLists.txt
View file

@ -16,7 +16,7 @@ target_include_directories(wkt PRIVATE
${MAPBOX_GEOMETRY_INCLUDE_DIRS} ${MAPBOX_GEOMETRY_INCLUDE_DIRS}
${MAPBOX_VARIANT_INCLUDE_DIRS} ${MAPBOX_VARIANT_INCLUDE_DIRS}
) )
target_link_libraries(wkt PRIVATE mapnik::headers) target_link_libraries(wkt PRIVATE mapnik::core)
install(TARGETS wkt install(TARGETS wkt
EXPORT MapnikTargets EXPORT MapnikTargets

12
test/CMakeLists.txt
View file

@ -108,7 +108,7 @@ add_executable(mapnik-test-unit
) )
target_link_libraries(mapnik-test-unit PUBLIC target_link_libraries(mapnik-test-unit PUBLIC
Catch Catch
mapnik::headers mapnik::core
mapnik::agg mapnik::agg
mapnik::mapnik mapnik::mapnik
mapnik::json 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) add_executable(agg_rasterizer_integer_overflow_test standalone/agg_rasterizer_integer_overflow_test.cpp)
target_link_libraries(agg_rasterizer_integer_overflow_test PUBLIC target_link_libraries(agg_rasterizer_integer_overflow_test PUBLIC
Catch Catch
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
mapnik::agg mapnik::agg
mapnik::json 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) add_executable(datasource_registration_test standalone/datasource_registration_test.cpp)
target_link_libraries(datasource_registration_test PUBLIC target_link_libraries(datasource_registration_test PUBLIC
Catch Catch
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
mapnik::agg mapnik::agg
) )
@ -135,7 +135,7 @@ target_link_libraries(datasource_registration_test PUBLIC
add_executable(font_registration_test standalone/font_registration_test.cpp) add_executable(font_registration_test standalone/font_registration_test.cpp)
target_link_libraries(font_registration_test PUBLIC target_link_libraries(font_registration_test PUBLIC
Catch Catch
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
mapnik::agg mapnik::agg
mapnik::json mapnik::json
@ -145,7 +145,7 @@ target_link_libraries(font_registration_test PUBLIC
add_executable(map_xml_test standalone/map_xml_test.cpp) add_executable(map_xml_test standalone/map_xml_test.cpp)
target_link_libraries(map_xml_test PUBLIC target_link_libraries(map_xml_test PUBLIC
Catch Catch
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
mapnik::agg mapnik::agg
mapnik::json mapnik::json
@ -162,7 +162,7 @@ target_link_libraries(
Catch Catch
Boost::program_options Boost::program_options
Boost::filesystem Boost::filesystem
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
mapnik::agg mapnik::agg
) )

2
utils/geometry_to_wkb/CMakeLists.txt
View file

@ -3,7 +3,7 @@ project(geometry_to_wkb)
add_executable(geometry_to_wkb main.cpp) add_executable(geometry_to_wkb main.cpp)
target_link_libraries(geometry_to_wkb PRIVATE target_link_libraries(geometry_to_wkb PRIVATE
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
) )

2
utils/mapnik-index/CMakeLists.txt
View file

@ -9,7 +9,7 @@ add_executable(mapnik-index
../../plugins/input/csv/csv_utils.cpp # this project depends on this file ../../plugins/input/csv/csv_utils.cpp # this project depends on this file
) )
target_link_libraries(mapnik-index PRIVATE target_link_libraries(mapnik-index PRIVATE
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
mapnik::json mapnik::json
mapnik::wkt mapnik::wkt

2
utils/mapnik-render/CMakeLists.txt
View file

@ -5,7 +5,7 @@ find_package(Boost 1.74 REQUIRED COMPONENTS program_options)
add_executable(mapnik-render mapnik-render.cpp) add_executable(mapnik-render mapnik-render.cpp)
target_link_libraries(mapnik-render PRIVATE target_link_libraries(mapnik-render PRIVATE
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
Boost::program_options Boost::program_options
) )

2
utils/ogrindex/CMakeLists.txt
View file

@ -3,7 +3,7 @@ project(ogrindex)
add_executable(ogrindex ogrindex.cpp) 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 install(TARGETS ogrindex
EXPORT MapnikTargets EXPORT MapnikTargets

2
utils/pgsql2sqlite/CMakeLists.txt
View file

@ -13,7 +13,7 @@ target_link_libraries(pgsql2sqlite PRIVATE
SQLite::SQLite3 SQLite::SQLite3
PostgreSQL::PostgreSQL PostgreSQL::PostgreSQL
Boost::program_options Boost::program_options
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
) )

2
utils/shapeindex/CMakeLists.txt
View file

@ -9,7 +9,7 @@ add_executable(shapeindex
target_include_directories(shapeindex PRIVATE ../../plugins/input/shape) target_include_directories(shapeindex PRIVATE ../../plugins/input/shape)
target_link_libraries(shapeindex PRIVATE target_link_libraries(shapeindex PRIVATE
Boost::program_options Boost::program_options
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
) )
install(TARGETS shapeindex install(TARGETS shapeindex

2
utils/svg2png/CMakeLists.txt
View file

@ -8,7 +8,7 @@ add_executable(svg2png
target_link_libraries(svg2png PRIVATE target_link_libraries(svg2png PRIVATE
Boost::program_options Boost::program_options
mapnik::headers mapnik::core
mapnik::mapnik mapnik::mapnik
mapnik::agg mapnik::agg
) )