[geos-commits] [SCM] GEOS branch main updated. d9422f5ef776c87c78dabd705e486ee08ca39be7
git at osgeo.org
git at osgeo.org
Fri Aug 16 12:28:04 PDT 2024
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".
The branch, main has been updated
via d9422f5ef776c87c78dabd705e486ee08ca39be7 (commit)
from 7cb7e3f9fe1d858a56d78fa91feffa0279a86104 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d9422f5ef776c87c78dabd705e486ee08ca39be7
Author: Mike Taves <mwtoews at gmail.com>
Date: Sat Aug 17 07:27:46 2024 +1200
Establish minimum CMake version 3.15 (#1143)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bf0ccab67..54564f531 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,7 +54,7 @@ jobs:
cxxstd: 14
arch: 64
packages: 'g++-7-multilib gcc-7-multilib'
- cmake: 3.13.*
+ cmake: 3.17.*
os: ubuntu-20.04
- cxx_compiler: g++-7
@@ -63,7 +63,7 @@ jobs:
cxxstd: 14
arch: 32
packages: 'g++-7-multilib gcc-7-multilib g++-multilib gcc-multilib'
- cmake: 3.13.*
+ cmake: 3.18.*
os: ubuntu-20.04
- cxx_compiler: g++-8
@@ -72,7 +72,7 @@ jobs:
cxxstd: 14
arch: 64
packages: 'g++-8-multilib gcc-8-multilib'
- cmake: 3.13.*
+ cmake: 3.21.*
os: ubuntu-20.04
- cxx_compiler: g++-9
@@ -81,7 +81,7 @@ jobs:
cxxstd: 14
arch: 64
packages: 'g++-9-multilib gcc-9-multilib'
- cmake: 3.13.*
+ cmake: 3.23.*
os: ubuntu-20.04
- cxx_compiler: g++-10
@@ -90,7 +90,7 @@ jobs:
cxxstd: 14
arch: 64
packages: 'g++-10-multilib gcc-10-multilib'
- cmake: 3.13.*
+ cmake: 3.25.*
os: ubuntu-20.04
# gcc 10 and lower are not supported
@@ -102,7 +102,7 @@ jobs:
cxxstd: 17
arch: 64
packages: 'g++-11-multilib gcc-11-multilib'
- cmake: 3.22.*
+ cmake: 3.27.*
os: ubuntu-22.04
- cxx_compiler: g++-12
@@ -111,7 +111,7 @@ jobs:
cxxstd: 20
arch: 64
packages: 'g++-12-multilib gcc-12-multilib'
- cmake: 3.22.*
+ cmake: 3.29.*
os: ubuntu-22.04
# - cxx_compiler: g++-13
@@ -132,7 +132,7 @@ jobs:
cxxstd: 14
arch: 64
packages: 'clang-7'
- cmake: 3.13.*
+ cmake: 3.15.*
os: ubuntu-20.04
- cxx_compiler: clang++-8
@@ -141,7 +141,7 @@ jobs:
cxxstd: 14
arch: 64
packages: 'clang-8'
- cmake: 3.13.*
+ cmake: 3.17.*
os: ubuntu-20.04
- cxx_compiler: clang++-9
@@ -150,7 +150,7 @@ jobs:
cxxstd: 14
arch: 64
packages: 'clang-9'
- cmake: 3.13.*
+ cmake: 3.20.*
os: ubuntu-20.04
- cxx_compiler: clang++-10
@@ -159,7 +159,7 @@ jobs:
cxxstd: 14
arch: 64
packages: 'clang-10'
- cmake: 3.17.*
+ cmake: 3.21.*
os: ubuntu-20.04
# clang 10 and lower are not supported
@@ -171,7 +171,7 @@ jobs:
cxxstd: 14
arch: 64
packages: 'clang-11'
- cmake: 3.25.*
+ cmake: 3.23.*
os: ubuntu-22.04
- cxx_compiler: clang++-12
@@ -189,7 +189,7 @@ jobs:
cxxstd: 17
arch: 64
packages: 'clang-13'
- cmake: 3.25.*
+ cmake: 3.27.*
os: ubuntu-22.04
- cxx_compiler: clang++-14
@@ -198,7 +198,7 @@ jobs:
cxxstd: 20
arch: 64
packages: 'clang-14'
- cmake: 3.25.*
+ cmake: 3.29.*
os: ubuntu-22.04
runs-on: ${{ matrix.ci.os }}
@@ -544,7 +544,7 @@ jobs:
sudo -E apt-get update
sudo -E apt-get autopurge -y needrestart
sudo -E apt-get -yq --no-install-suggests --no-install-recommends install make python3-pip g++
- python3 -m pip install --disable-pip-version-check --user cmake==3.13.*
+ python3 -m pip install --disable-pip-version-check --user cmake==3.15.*
echo "$(python3 -m site --user-base)/bin" >> $GITHUB_PATH
- name: 'Check Out'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9f332217..c5548cecc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,9 +9,7 @@
# See the COPYING file for more information.
##############################################################################
-# Require CMake 3.13+ with support for meta-features that request compiler
-# modes for specific C/C++ language standard levels, and object libraries.
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.15)
#-----------------------------------------------------------------------------
# Version
@@ -24,6 +22,7 @@ string(REGEX MATCH "GEOS_VERSION_MINOR=([0-9]+)" _ ${_version_txt})
set(_version_minor ${CMAKE_MATCH_1})
string(REGEX MATCH "GEOS_VERSION_PATCH=([0-9]+)" _ ${_version_txt})
set(_version_patch ${CMAKE_MATCH_1})
+set(GEOS_VERSION_NOPATCH "${_version_major}.${_version_minor}.${_version_patch}")
# OPTIONS: "", "dev", "rc1" etc.
string(REGEX MATCH "GEOS_PATCH_WORD=([a-zA-Z0-9]+)" _ ${_version_txt})
set(_version_patch_word ${CMAKE_MATCH_1})
@@ -56,23 +55,19 @@ unset(_version_capi_revision)
#-----------------------------------------------------------------------------
# Project
#-----------------------------------------------------------------------------
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.9)
- list(APPEND _project_info DESCRIPTION "GEOS - C++ port of the Java Topology Suite (JTS)")
-endif()
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
- list(APPEND _project_info HOMEPAGE_URL "https://libgeos.org/")
-endif()
-project(GEOS VERSION "${_version_major}.${_version_minor}.${_version_patch}"
+project(GEOS
+ VERSION ${GEOS_VERSION_NOPATCH}
LANGUAGES C CXX
- ${_project_info})
+ DESCRIPTION "GEOS - C++ port of the Java Topology Suite (JTS)"
+ HOMEPAGE_URL "https://libgeos.org/"
+)
if(NOT "${_version_patch_word}" STREQUAL "")
# Re-write VERSION variables after project()
set(GEOS_VERSION "${GEOS_VERSION}${_version_patch_word}")
set(GEOS_VERSION_PATCH "${_version_patch}${_version_patch_word}")
endif()
-set(GEOS_VERSION_NOPATCH "${_version_major}.${_version_minor}.${_version_patch}")
unset(_version_major)
unset(_version_minor)
@@ -98,12 +93,6 @@ endif()
# Default to release build so packagers don't release debug builds
set(DEFAULT_BUILD_TYPE Release)
-# Require CMake 3.13+ with VS generator for complete support of VS versions
-# and support by AppVeyor.
-if(${CMAKE_GENERATOR} MATCHES "Visual Studio")
- cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
-endif()
-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
# TODO: Follow CMake detection of git and version tagging
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/ci.yml | 30 +++++++++++++++---------------
CMakeLists.txt | 25 +++++++------------------
2 files changed, 22 insertions(+), 33 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list