mirror of
https://github.com/mapnik/mapnik.git
synced 2025-12-08 20:13:09 +00:00
CMake - add optional SSL support in tiles.input via USE_PLUGIN_INPUT_TILES_SSL (default:ON)
This commit is contained in:
parent
765347e999
commit
ac5266d17e
3
.github/workflows/release_linux.yml
vendored
3
.github/workflows/release_linux.yml
vendored
@ -40,7 +40,8 @@ jobs:
|
||||
libboost-program-options-dev \
|
||||
libboost-regex-dev \
|
||||
libboost-url-dev \
|
||||
libboost-context-dev
|
||||
libboost-context-dev \
|
||||
libssl-dev
|
||||
|
||||
- name: Configure CMake
|
||||
run: cmake -LA --preset ${{ env.PRESET }}
|
||||
|
||||
@ -77,6 +77,7 @@ mapnik_option(USE_PLUGIN_INPUT_RASTER "adds plugin input raster" ON)
|
||||
mapnik_option(USE_PLUGIN_INPUT_SHAPE "adds plugin input shape" ON)
|
||||
mapnik_option(USE_PLUGIN_INPUT_SQLITE "adds plugin input sqlite" ON)
|
||||
mapnik_option(USE_PLUGIN_INPUT_TILES "adds plugin input tiles" ON)
|
||||
mapnik_option(USE_PLUGIN_INPUT_TILES_SSL "adds SSL support in plugin input tiles" ON)
|
||||
mapnik_option(USE_PLUGIN_INPUT_TOPOJSON "adds plugin input topojson" ON)
|
||||
|
||||
mapnik_option(BUILD_DEMO_VIEWER "builds the demo viewer" ON)
|
||||
|
||||
@ -9,6 +9,11 @@ endif()
|
||||
add_plugin_target(input-tiles "tiles")
|
||||
add_compile_definitions(MAPNIK_VECTOR_TILE_LIBRARY=1)
|
||||
|
||||
if(USE_PLUGIN_INPUT_TILES_SSL)
|
||||
mapnik_pkg_check_modules(OpenSSL REQUIRED IMPORTED_TARGET openssl)
|
||||
add_compile_definitions(MAPNIK_HAS_OPENSSL)
|
||||
endif()
|
||||
|
||||
target_sources(input-tiles ${_plugin_visibility}
|
||||
tiles_datasource.cpp
|
||||
vector_tiles_featureset.cpp
|
||||
@ -29,6 +34,10 @@ target_link_libraries(input-tiles ${_plugin_visibility}
|
||||
Boost::context
|
||||
)
|
||||
|
||||
if(USE_PLUGIN_INPUT_TILES_SSL)
|
||||
target_link_libraries(input-tiles ${_plugin_visibility} PkgConfig::OpenSSL)
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
target_link_libraries(input-tiles ${_plugin_visibility} Boost::json)
|
||||
endif()
|
||||
|
||||
@ -65,6 +65,7 @@
|
||||
"mapbox-geometry",
|
||||
"mapbox-polylabel",
|
||||
"mapbox-variant",
|
||||
"openssl",
|
||||
"proj",
|
||||
"protozero",
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user