[geos-commits] [SCM] GEOS branch main updated. f65bb355896a9bebc4a52a638c2c67df4959ffb7

[git at osgeo.org]

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  f65bb355896a9bebc4a52a638c2c67df4959ffb7 (commit)
      from  a08dcd4dfdd722e454d4dc89dbef77a70fad5974 (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 f65bb355896a9bebc4a52a638c2c67df4959ffb7
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Oct 15 13:12:43 2021 -0700

    Use OBJECT library to build ryu, so it can be fully included in
    static libgeos.a, and up the cmake requirement to 3.13 to support
    that change. References #1103

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 56ea589..0c3c2e1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,7 +39,7 @@ jobs:
           cxxstd: 11,
           arch: 64,
           packages: 'clang',
-          cmake: 3.10.*,
+          cmake: 3.13.*,
           os: ubuntu-18.04
         }
         - {
@@ -48,7 +48,7 @@ jobs:
           cxxstd: 11,
           arch: 64,
           packages: 'clang',
-          cmake: 3.10.*,
+          cmake: 3.13.*,
           os: ubuntu-18.04
         }
         - {
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 896dfb8..56d9494 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,9 +9,9 @@
 # See the COPYING file for more information.
 ##############################################################################
 
-# Require CMake 3.8+ with support for meta-features that request compiler
-# modes for specific C/C++ language standard levels.
-cmake_minimum_required(VERSION 3.8)
+# 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)
 
 # Default to release build so packagers don't release debug builds
 set(DEFAULT_BUILD_TYPE Release)
diff --git a/src/deps/CMakeLists.txt b/src/deps/CMakeLists.txt
index a8be0a5..5c8ed27 100644
--- a/src/deps/CMakeLists.txt
+++ b/src/deps/CMakeLists.txt
@@ -9,7 +9,7 @@
 # See the COPYING file for more information.
 ################################################################################
 file(GLOB_RECURSE _sources ${CMAKE_CURRENT_LIST_DIR}/*.c  CONFIGURE_DEPEND)
-add_library(ryu STATIC ${_sources})
+add_library(ryu OBJECT ${_sources})
 target_include_directories(ryu PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 set_target_properties(ryu PROPERTIES
   POSITION_INDEPENDENT_CODE ON

-----------------------------------------------------------------------

Summary of changes:
 .github/workflows/ci.yml | 4 ++--
 CMakeLists.txt           | 6 +++---
 src/deps/CMakeLists.txt  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GEOS