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

remove plugins from generated targets; install includes

Browse source
This commit is contained in:
Mathis Logemann 2020-11-21 11:40:55 +01:00
parent 6254f7c09e
commit f390a830ae
12 changed files with 10 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
CMakeLists.txt
View file

@ -144,11 +144,11 @@ if(USE_CAIRO)
list(APPEND MAPNIK_OPTIONAL_LIBS Cairo::Cairo)
endif()
add_library(mapnik-headers INTERFACE)
add_library(mapnik::headers ALIAS mapnik-headers)
add_library(headers INTERFACE)
add_library(mapnik::headers ALIAS headers)
# todo: mapbox includes need to included private.
target_include_directories(mapnik-headers INTERFACE
target_include_directories(headers INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
${MAPBOX_GEOMETRY_INCLUDE_DIRS}
@ -158,7 +158,7 @@ target_include_directories(mapnik-headers INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/deps>
$<INSTALL_INTERFACE:deps>
)
target_link_libraries(mapnik-headers INTERFACE
target_link_libraries(headers INTERFACE
Boost::boost
Boost::regex
Boost::filesystem
@ -167,9 +167,9 @@ target_link_libraries(mapnik-headers INTERFACE
harfbuzz::harfbuzz
${MAPNIK_OPTIONAL_LIBS}
)
target_compile_definitions(mapnik-headers INTERFACE ${MAPNIK_COMPILE_DEFS})
target_compile_definitions(headers INTERFACE ${MAPNIK_COMPILE_DEFS})
install(TARGETS mapnik-headers
install(TARGETS headers
EXPORT MapnikTargets
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
@ -208,3 +208,6 @@ install(EXPORT MapnikTargets
NAMESPACE mapnik::
DESTINATION lib/cmake/mapnik
)
install(DIRECTORY include/ DESTINATION include)
install(DIRECTORY deps/agg/include/ DESTINATION include)

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

@ -22,10 +22,7 @@ set_target_properties(input-csv PROPERTIES SUFFIX ".input")
#install(TARGETS input-csv DESTINATION bin/plugins/input)
install(TARGETS input-csv
EXPORT MapnikTargets
LIBRARY DESTINATION lib/plugins/input
ARCHIVE DESTINATION lib/plugins/input
RUNTIME DESTINATION bin/plugins/input
INCLUDES DESTINATION .
PUBLIC_HEADER DESTINATION .
)

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

@ -20,10 +20,7 @@ set_target_properties(input-gdal PROPERTIES OUTPUT_NAME "gdal")
set_target_properties(input-gdal PROPERTIES SUFFIX ".input")
install(TARGETS input-gdal
EXPORT MapnikTargets
LIBRARY DESTINATION lib/plugins/input
ARCHIVE DESTINATION lib/plugins/input
RUNTIME DESTINATION bin/plugins/input
INCLUDES DESTINATION .
PUBLIC_HEADER DESTINATION .
)

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

@ -16,10 +16,7 @@ set_target_properties(input-geobuf PROPERTIES OUTPUT_NAME "geobuf")
set_target_properties(input-geobuf PROPERTIES SUFFIX ".input")
install(TARGETS input-geobuf
EXPORT MapnikTargets
LIBRARY DESTINATION lib/plugins/input
ARCHIVE DESTINATION lib/plugins/input
RUNTIME DESTINATION bin/plugins/input
INCLUDES DESTINATION .
PUBLIC_HEADER DESTINATION .
)

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

@ -20,10 +20,7 @@ set_target_properties(input-geojson PROPERTIES OUTPUT_NAME "geojson")
set_target_properties(input-geojson PROPERTIES SUFFIX ".input")
install(TARGETS input-geojson
EXPORT MapnikTargets
LIBRARY DESTINATION lib/plugins/input
ARCHIVE DESTINATION lib/plugins/input
RUNTIME DESTINATION bin/plugins/input
INCLUDES DESTINATION .
PUBLIC_HEADER DESTINATION .
)

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

@ -22,10 +22,7 @@ set_target_properties(input-ogr PROPERTIES OUTPUT_NAME "ogr")
set_target_properties(input-ogr PROPERTIES SUFFIX ".input")
install(TARGETS input-ogr
EXPORT MapnikTargets
LIBRARY DESTINATION lib/plugins/input
ARCHIVE DESTINATION lib/plugins/input
RUNTIME DESTINATION bin/plugins/input
INCLUDES DESTINATION .
PUBLIC_HEADER DESTINATION .
)

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

@ -21,10 +21,7 @@ set_target_properties(input-pgraster PROPERTIES OUTPUT_NAME "pgraster")
set_target_properties(input-pgraster PROPERTIES SUFFIX ".input")
install(TARGETS input-pgraster
EXPORT MapnikTargets
LIBRARY DESTINATION lib/plugins/input
ARCHIVE DESTINATION lib/plugins/input
RUNTIME DESTINATION bin/plugins/input
INCLUDES DESTINATION .
PUBLIC_HEADER DESTINATION .
)

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

@ -20,10 +20,7 @@ set_target_properties(input-postgis PROPERTIES OUTPUT_NAME "postgis")
set_target_properties(input-postgis PROPERTIES SUFFIX ".input")
install(TARGETS input-postgis
EXPORT MapnikTargets
LIBRARY DESTINATION lib/plugins/input
ARCHIVE DESTINATION lib/plugins/input
RUNTIME DESTINATION bin/plugins/input
INCLUDES DESTINATION .
PUBLIC_HEADER DESTINATION .
)

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

@ -18,10 +18,7 @@ set_target_properties(input-raster PROPERTIES OUTPUT_NAME "raster")
set_target_properties(input-raster PROPERTIES SUFFIX ".input")
install(TARGETS input-raster
EXPORT MapnikTargets
LIBRARY DESTINATION lib/plugins/input
ARCHIVE DESTINATION lib/plugins/input
RUNTIME DESTINATION bin/plugins/input
INCLUDES DESTINATION .
PUBLIC_HEADER DESTINATION .
)

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

@ -21,10 +21,7 @@ set_target_properties(input-shape PROPERTIES OUTPUT_NAME "shape")
set_target_properties(input-shape PROPERTIES SUFFIX ".input")
install(TARGETS input-shape
EXPORT MapnikTargets
LIBRARY DESTINATION lib/plugins/input
ARCHIVE DESTINATION lib/plugins/input
RUNTIME DESTINATION bin/plugins/input
INCLUDES DESTINATION .
PUBLIC_HEADER DESTINATION .
)

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

@ -19,11 +19,8 @@ set_target_properties(input-sqlite PROPERTIES PREFIX "")
set_target_properties(input-sqlite PROPERTIES OUTPUT_NAME "sqlite")
set_target_properties(input-sqlite PROPERTIES SUFFIX ".input")
install(TARGETS input-sqlite
EXPORT MapnikTargets
install(TARGETS input-sqlite
LIBRARY DESTINATION lib/plugins/input
ARCHIVE DESTINATION lib/plugins/input
RUNTIME DESTINATION bin/plugins/input
INCLUDES DESTINATION .
PUBLIC_HEADER DESTINATION .
)

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

@ -18,10 +18,7 @@ set_target_properties(input-topojson PROPERTIES OUTPUT_NAME "topojson")
set_target_properties(input-topojson PROPERTIES SUFFIX ".input")
install(TARGETS input-topojson
EXPORT MapnikTargets
LIBRARY DESTINATION lib/plugins/input
ARCHIVE DESTINATION lib/plugins/input
RUNTIME DESTINATION bin/plugins/input
INCLUDES DESTINATION .
PUBLIC_HEADER DESTINATION .
)