sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4444 from mapnik/feature/increase_min_cxx_standard

Browse source 
Increase min cxx standard to 17
This commit is contained in:
Mathis Logemann 2024-04-19 20:04:58 +02:00 committed by GitHub
commit a85bc95135
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build_and_test.yml vendored
View file

@ -29,15 +29,11 @@ jobs:
Build & Test Build & Test
(${{ matrix.os }}) (${{ matrix.os }})
(C++ ${{ matrix.cxx-standard }}) (C++ ${{ matrix.cxx-standard }})
${{ matrix.memory-mapped == 'OFF' && '(USE_MEMORY_MAPPED_FILE=OFF)' || '' }}
${{ matrix.static-build == 'OFF' && '(BUILD_SHARED_LIBS=OFF)' || '' }}
needs: checkSource needs: checkSource
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [macos-latest, windows-latest, ubuntu-latest] os: [macos-latest, windows-latest, ubuntu-latest]
memory-mapped: ["ON"]
static-build: ["OFF"]
cxx-standard: [17] cxx-standard: [17]
include: include:
- os: ubuntu-latest - os: ubuntu-latest

2
CMakeLists.txt
View file

@ -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_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++<ver> if off set(CMAKE_CXX_EXTENSIONS OFF CACHE STRING "Enables the compiler specific extensions.") # Fallsback to -std=c++<ver> if off
message(STATUS "Using c++${CMAKE_CXX_STANDARD}") message(STATUS "Using c++${CMAKE_CXX_STANDARD}")