Move MAPNIK_MAJOR_VERSION checks around (#439)

openstreetmap · Jun 5, 2024 · 1f81434 · 1f81434
1 parent ba0d2af
commit 1f81434
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 28 deletions.
diff --git a/docker/centos/stream/Dockerfile b/docker/centos/stream/Dockerfile
@@ -98,7 +98,7 @@ RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/
     dnf --assumeyes install \
         boost-devel \
         cairo-devel \
-        cmake3 \
+        cmake \
         gcc \
         gcc-c++ \
         gdal \

diff --git a/docker/centos/stream/Dockerfile.mapnik-latest b/docker/centos/stream/Dockerfile.mapnik-latest
@@ -19,10 +19,10 @@ RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/
     dnf --assumeyes install epel-release && \
     dnf --assumeyes upgrade && \
     dnf --assumeyes install \
-        boost1.78-devel \
+        boost-devel \
         bzip2 \
         cairo-devel \
-        cmake3 \
+        cmake \
         freetype-devel \
         gcc \
         gcc-c++ \
@@ -82,9 +82,9 @@ RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/
     dnf --assumeyes install epel-release && \
     dnf --assumeyes upgrade && \
     dnf --assumeyes install \
-        boost1.78-devel \
+        boost-devel \
         cairo-devel \
-        cmake3 \
+        cmake \
         freetype-devel \
         gcc \
         gcc-c++ \
@@ -104,6 +104,7 @@ RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/
         libxml2-devel \
         make \
         pkg-config \
+        procps \
         proj-devel
 
 ## Copy files from builder(s)
@@ -116,7 +117,6 @@ WORKDIR /tmp/mod_tile_build
 RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \
     cmake -B . -S /tmp/mod_tile_src \
         -DCMAKE_BUILD_TYPE:STRING=Release \
-        -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES:PATH=/usr/include/boost1.78 \
         -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \
         -DCMAKE_INSTALL_PREFIX:PATH=/usr \
         -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \
@@ -145,9 +145,7 @@ RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/
     dnf --assumeyes install epel-release && \
     dnf --assumeyes upgrade && \
     dnf --assumeyes install \
-        boost1.78-filesystem \
-        boost1.78-program-options \
-        boost1.78-regex \
+        boost-regex \
         cairo \
         gdal \
         harfbuzz \

diff --git a/src/gen_tile.cpp b/src/gen_tile.cpp
@@ -18,7 +18,6 @@
 #include <dirent.h>
 #include <exception>
 #include <glib.h>
-#include <limits.h>
 #include <map>
 #include <mapnik/agg_renderer.hpp>
 #include <mapnik/coord.hpp>
@@ -35,8 +34,6 @@
 #include <mapnik/params.hpp>
 #include <mapnik/pixel_types.hpp>
 #include <mapnik/version.hpp>
-#include <math.h>
-#include <memory>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -46,6 +43,12 @@
 #include <unistd.h>
 #include <utility>
 
+#if MAPNIK_MAJOR_VERSION >= 4
+#include <mapnik/geometry/box2d.hpp>
+#else
+#include <mapnik/box2d.hpp>
+#endif
+
 #include "cache_expire.h"
 #include "g_logger.h"
 #include "gen_tile.h"
@@ -57,12 +60,6 @@
 #include "request_queue.h"
 #include "store.h"
 
-#if MAPNIK_MAJOR_VERSION >= 4
-#include <mapnik/geometry/box2d.hpp>
-#else
-#include <mapnik/box2d.hpp>
-#endif
-
 #ifndef DEG_TO_RAD
 #define DEG_TO_RAD (M_PI / 180)
 #endif

diff --git a/src/parameterize_style.cpp b/src/parameterize_style.cpp
@@ -15,16 +15,17 @@
  * along with this program; If not, see http://www.gnu.org/licenses/.
  */
 
-#if MAPNIK_MAJOR_VERSION < 4
-#include <boost/optional.hpp>
-#endif
 #include <mapnik/datasource.hpp>
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/layer.hpp>
 #include <mapnik/map.hpp>
 #include <mapnik/params.hpp>
 #include <mapnik/version.hpp>
 
+#if MAPNIK_MAJOR_VERSION < 4
+#include <boost/optional.hpp>
+#endif
+
 #include "g_logger.h"
 #include "parameterize_style.hpp"
 

diff --git a/tests/gen_tile_test.cpp b/tests/gen_tile_test.cpp
@@ -25,6 +25,7 @@
 #include <pthread.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 #include <string>
 #include <strings.h>
 #include <sys/stat.h>
@@ -34,6 +35,12 @@
 #include <tuple>
 #include <unistd.h>
 
+#if MAPNIK_MAJOR_VERSION >= 4
+#include <mapnik/geometry/box2d.hpp>
+#else
+#include <mapnik/box2d.hpp>
+#endif
+
 #include "catch/catch.hpp"
 #include "catch_test_common.hpp"
 #include "config.h"
@@ -46,13 +53,6 @@
 #include "renderd.h"
 #include "request_queue.h"
 #include "store.h"
-#include "string.h"
-
-#if MAPNIK_MAJOR_VERSION >= 4
-#include <mapnik/geometry/box2d.hpp>
-#else
-#include <mapnik/box2d.hpp>
-#endif
 
 #define NO_QUEUE_REQUESTS 9
 #define NO_TEST_REPEATS 100