Modernize CMake config

Author: joto

.github/workflows/ci.yml

@@ -22,35 +22,21 @@ jobs:
           - "fedora:43"
         build_type: [Dev]
         cpp_compiler: [g++]
-        cpp_version: [c++17]
         include:
           - image: "ubuntu:22.04"
             CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
           - image: "ubuntu:24.04"
             CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
-          - image: "debian:bookworm"
-            cpp_version: c++20
           - image: "debian:bookworm"
             c_compiler: clang
             cpp_compiler: clang++
-          - image: "debian:bookworm"
-            c_compiler: clang
-            cpp_compiler: clang++
-            cpp_version: c++20
           - image: "debian:bookworm"
             build_type: RelWithDebInfo
           - image: "debian:trixie"
             CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
-          - image: "debian:trixie"
-            cpp_version: c++20
-            CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
-          - image: "debian:trixie"
-            c_compiler: clang
-            cpp_compiler: clang++
           - image: "debian:trixie"
             c_compiler: clang
             cpp_compiler: clang++
-            cpp_version: c++20
           - image: "debian:trixie"
             build_type: RelWithDebInfo
             CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
@@ -81,7 +67,6 @@ jobs:
         CXX: ${{ matrix.cpp_compiler }}
         CXXFLAGS: ${{ matrix.CXXFLAGS }}
         LDFLAGS: ${{ matrix.LDFLAGS }}
-        CPP_VERSION: ${{ matrix.cpp_version }}
         APT_LISTCHANGES_FRONTEND: none
         DEBIAN_FRONTEND: noninteractive
     steps:

CMakeLists.txt

@@ -6,9 +6,18 @@
 #
 #-----------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.10)
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
+#-----------------------------------------------------------------------------
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 
 #-----------------------------------------------------------------------------
 #
@@ -22,18 +31,7 @@ set(CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;MinSizeRel;Dev"
     "List of available configuration types"
     FORCE)
 
-project(osm-gis-export)
-
-set(OSM_GIS_EXPORT_VERSION_MAJOR 0)
-set(OSM_GIS_EXPORT_VERSION_MINOR 0)
-set(OSM_GIS_EXPORT_VERSION_PATCH 1)
-
-set(OSM_GIS_EXPORT_VERSION
-    ${OSM_GIS_EXPORT_VERSION_MAJOR}.${OSM_GIS_EXPORT_VERSION_MINOR}.${OSM_GIS_EXPORT_VERSION_PATCH})
-
-set(AUTHOR "Jochen Topf <jochen@topf.org>")
-
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+project(osm-gis-export VERSION 0.0.1 LANGUAGES CXX C)
 
 
 #-----------------------------------------------------------------------------
@@ -121,23 +119,6 @@ else()
 endif()
 
 
-#-----------------------------------------------------------------------------
-#
-#  Decide which C++ version to use (Minimum/default: C++17).
-#
-#-----------------------------------------------------------------------------
-if(NOT MSVC)
-    if(NOT USE_CPP_VERSION)
-        set(USE_CPP_VERSION c++17)
-    endif()
-    message(STATUS "Use C++ version: ${USE_CPP_VERSION}")
-    # following only available from cmake 2.8.12:
-    #   add_compile_options(-std=${USE_CPP_VERSION})
-    # so using this instead:
-    add_definitions(-std=${USE_CPP_VERSION})
-endif()
-
-
 #-----------------------------------------------------------------------------
 #
 #  Compiler and Linker flags