From dc5ad24ef82265cb892620b3de1c0e7d18b9a66a Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Fri, 19 Apr 2024 18:17:01 +0200 Subject: [PATCH 1/2] Increase min cxx standard to 17 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a745fabd7..9b68166f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ set(MAPNIK_OPTIONAL_LIBS_INCLUDE "") ############################# ############################# -set(CMAKE_CXX_STANDARD 14 CACHE STRING "Sets the c++ standard. c++14 is minimum.") +set(CMAKE_CXX_STANDARD 17 CACHE STRING "Sets the c++ standard. c++17 is minimum.") set(CMAKE_CXX_STANDARD_REQUIRED ON) # require the specified CMAKE_CXX_STANDARD set(CMAKE_CXX_EXTENSIONS OFF CACHE STRING "Enables the compiler specific extensions.") # Fallsback to -std=c++ if off message(STATUS "Using c++${CMAKE_CXX_STANDARD}") From 15abda8b3e7e06ab34333ba3085bf331571e8fb2 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Fri, 19 Apr 2024 18:20:33 +0200 Subject: [PATCH 2/2] [workflow] Remove unused matrix options --- .github/workflows/build_and_test.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 0a4953c39..d32bb0513 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -29,15 +29,11 @@ jobs: Build & Test (${{ matrix.os }}) (C++ ${{ matrix.cxx-standard }}) - ${{ matrix.memory-mapped == 'OFF' && '(USE_MEMORY_MAPPED_FILE=OFF)' || '' }} - ${{ matrix.static-build == 'OFF' && '(BUILD_SHARED_LIBS=OFF)' || '' }} needs: checkSource strategy: fail-fast: false matrix: os: [macos-latest, windows-latest, ubuntu-latest] - memory-mapped: ["ON"] - static-build: ["OFF"] cxx-standard: [17] include: - os: ubuntu-latest