From 6fcdccaf831bf413f2e9fc1e4d10b662ef050b36 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 9 Feb 2022 15:57:03 +0100 Subject: [PATCH] [CMake] fix rename MAPNIK_STATIC_PLUGINS => BUILD_SHARED_PLUGINS --- cmake/MapnikInstall.cmake | 2 +- plugins/input/CMakeLists.txt | 4 +-- src/CMakeLists.txt | 50 ++++++++++++++++++------------------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/cmake/MapnikInstall.cmake b/cmake/MapnikInstall.cmake index 7983c75e5..b12ccab4c 100644 --- a/cmake/MapnikInstall.cmake +++ b/cmake/MapnikInstall.cmake @@ -23,7 +23,7 @@ endfunction() # Install plugins # function(mapnik_install_plugin _target) - if(MAPNIK_STATIC_PLUGINS) + if(NOT BUILD_SHARED_PLUGINS) return() endif() install(TARGETS ${_target} diff --git a/plugins/input/CMakeLists.txt b/plugins/input/CMakeLists.txt index b5167c84a..500e8248c 100644 --- a/plugins/input/CMakeLists.txt +++ b/plugins/input/CMakeLists.txt @@ -6,7 +6,7 @@ set(_plugin_archive_output "${MAPNIK_OUTPUT_DIR}/lib") set(_plugin_fpic ON) set(_plugin_linkage MODULE) set(_plugin_visibility PRIVATE) -if(MAPNIK_STATIC_PLUGINS) +if(NOT BUILD_SHARED_PLUGINS) set(_plugin_linkage INTERFACE) set(_plugin_visibility INTERFACE) endif() @@ -78,7 +78,7 @@ endif() # # Copy all plugin dlls, so that these are in the main output dir, since cmake copies those into ${MAPNIK_OUTPUT_DIR}/plugins/input, too. # -if(NOT MAPNIK_STATIC_PLUGINS AND WIN32) +if(BUILD_SHARED_PLUGINS AND WIN32) list(LENGTH m_build_plugins m_number_plugins) if(m_number_plugins GREATER 0) string(CONFIGURE diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9fe5da903..dbbbcefe3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,36 +9,36 @@ endif() target_link_libraries(mapnik PUBLIC mapnik::core mapnik::datasource-base) target_link_libraries(mapnik PRIVATE mapnik::agg - # expr: if(MAPNIK_STATIC_PLUGINS == ON && is build) then add link target - $<$,$>:input-csv> - $<$,$>:input-gdal> - $<$,$>:input-geobuf> - $<$,$>:input-geojson> - $<$,$>:input-ogr> - $<$,$>:input-pgraster> - $<$,$>:input-postgis> - $<$,$>:input-raster> - $<$,$>:input-shape> - $<$,$>:input-sqlite> - $<$,$>:input-topojson> + # expr: if(BUILD_SHARED_PLUGINS == OFF && is build) then add link target + $<$>,$>:input-csv> + $<$>,$>:input-gdal> + $<$>,$>:input-geobuf> + $<$>,$>:input-geojson> + $<$>,$>:input-ogr> + $<$>,$>:input-pgraster> + $<$>,$>:input-postgis> + $<$>,$>:input-raster> + $<$>,$>:input-shape> + $<$>,$>:input-sqlite> + $<$>,$>:input-topojson> ) target_compile_definitions(mapnik PRIVATE - # expr: if(MAPNIK_STATIC_PLUGINS == ON && is build) then add build definition - $<$,$>:MAPNIK_STATIC_PLUGIN_CSV> - $<$,$>:MAPNIK_STATIC_PLUGIN_GDAL> - $<$,$>:MAPNIK_STATIC_PLUGIN_GEOBUF> - $<$,$>:MAPNIK_STATIC_PLUGIN_GEOJSON> - $<$,$>:MAPNIK_STATIC_PLUGIN_OGR> - $<$,$>:MAPNIK_STATIC_PLUGIN_PGRASTER> - $<$,$>:MAPNIK_STATIC_PLUGIN_POSTGIS> - $<$,$>:MAPNIK_STATIC_PLUGIN_RASTER> - $<$,$>:MAPNIK_STATIC_PLUGIN_SHAPE> - $<$,$>:MAPNIK_STATIC_PLUGIN_SQLITE> - $<$,$>:MAPNIK_STATIC_PLUGIN_TOPOJSON> + # expr: if(BUILD_SHARED_PLUGINS == OFF && is build) then add build definition + $<$>,$>:MAPNIK_STATIC_PLUGIN_CSV> + $<$>,$>:MAPNIK_STATIC_PLUGIN_GDAL> + $<$>,$>:MAPNIK_STATIC_PLUGIN_GEOBUF> + $<$>,$>:MAPNIK_STATIC_PLUGIN_GEOJSON> + $<$>,$>:MAPNIK_STATIC_PLUGIN_OGR> + $<$>,$>:MAPNIK_STATIC_PLUGIN_PGRASTER> + $<$>,$>:MAPNIK_STATIC_PLUGIN_POSTGIS> + $<$>,$>:MAPNIK_STATIC_PLUGIN_RASTER> + $<$>,$>:MAPNIK_STATIC_PLUGIN_SHAPE> + $<$>,$>:MAPNIK_STATIC_PLUGIN_SQLITE> + $<$>,$>:MAPNIK_STATIC_PLUGIN_TOPOJSON> ) -if(MAPNIK_STATIC_PLUGINS) +if(NOT BUILD_SHARED_PLUGINS) target_include_directories(mapnik PRIVATE "${PROJECT_SOURCE_DIR}/plugins") endif()