From feca084ed61942a1d598e69390e26af063800dd6 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 6 Oct 2021 15:15:32 +0200 Subject: [PATCH] bump boost version to 1.73 and fix docs --- INSTALL.md | 8 ++++---- SConstruct | 2 +- cmake/MapnikMinimumVersions.cmake | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 7ee6420c0..e226c1709 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -71,15 +71,15 @@ For troubleshooting help see https://github.com/mapnik/mapnik/wiki/InstallationT Build system dependencies are: - * C++ compiler supporting `-std=c++11` (like >= g++ 4.8 or >= clang++ 3.4) + * C++ compiler supporting `-std=c++14` (like >= g++ 4.8 or >= clang++ 3.4) * >= 2 GB RAM (> 5 GB for g++) * Python 2.4-2.7 - * Scons (a copy is bundled) + * Scons (a copy is bundled) or CMake >= 3.15 see [docs/cmake-usage.md](./docs/cmake-usage.md) Mapnik Core depends on: * Boost - - >= 1.47 is required and >= 1.56 recommended + - >= 1.73 is required - These libraries are used: - filesystem - system @@ -97,7 +97,7 @@ Mapnik Core optionally depends on: * libjpeg - JPEG graphics (Default enabled, if found) * libtiff - TIFF graphics (Default enabled, if found) * libwebp - WEBP graphics (Default enabled, if found) - * libproj - PROJ.4 projection library (Default enabled, if found) + * libproj >= 7.2.0 - PROJ projection library (Default enabled, if found) Additional optional dependencies: diff --git a/SConstruct b/SConstruct index 67f647272..9df2c5f9f 100644 --- a/SConstruct +++ b/SConstruct @@ -64,7 +64,7 @@ SCONS_CONFIGURE_CACHE = 'config.cache' SCONF_TEMP_DIR = '.sconf_temp' # auto-search directories for boost libs/headers BOOST_SEARCH_PREFIXES = ['/usr/local','/opt/local','/sw','/usr',] -BOOST_MIN_VERSION = '1.61' +BOOST_MIN_VERSION = '1.73' #CAIRO_MIN_VERSION = '1.8.0' PROJ_MIN_VERSION = (7, 2, 0) PROJ_MIN_VERSION_STRING = "%s.%s.%s" % PROJ_MIN_VERSION diff --git a/cmake/MapnikMinimumVersions.cmake b/cmake/MapnikMinimumVersions.cmake index b4ae45924..4c08d37a3 100644 --- a/cmake/MapnikMinimumVersions.cmake +++ b/cmake/MapnikMinimumVersions.cmake @@ -1,3 +1,3 @@ -set(BOOST_MIN_VERSION 1.61) +set(BOOST_MIN_VERSION 1.73) set(HARFBUZZ_MIN_VERSION 0.9.34) set(PROJ_MIN_VERSION 7.2.0)