[geos-commits] [SCM] GEOS branch master updated. c6abbf9f980bd21d4a0ce2818bc0480a4707afc9

[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, master has been updated
       via  c6abbf9f980bd21d4a0ce2818bc0480a4707afc9 (commit)
      from  b4a786c910080d716cbf8c1230eada9077f118c2 (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 c6abbf9f980bd21d4a0ce2818bc0480a4707afc9
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Mar 2 13:28:49 2021 -0800

    Allow build on older cmake

diff --git a/src/deps/CMakeLists.txt b/src/deps/CMakeLists.txt
index 7a6fac1..d8a1c3d 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 OBJECT ${_sources})
+add_library(ryu STATIC ${_sources})
 target_include_directories(ryu PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 set_target_properties(ryu PROPERTIES POSITION_INDEPENDENT_CODE ON)
 unset(_sources)
diff --git a/tests/xmltester/CMakeLists.txt b/tests/xmltester/CMakeLists.txt
index 87113ac..388dd05 100644
--- a/tests/xmltester/CMakeLists.txt
+++ b/tests/xmltester/CMakeLists.txt
@@ -14,7 +14,7 @@ add_executable(test_simplewkttester SimpleWKTTester.cpp)
 target_link_libraries(test_simplewkttester PRIVATE geos)
 
 # Setup tinyxml as a separate library so we can avoid picking up GEOS compile flags
-add_library(tinyxml2 OBJECT
+add_library(tinyxml2 STATIC
         tinyxml2/tinyxml2.h
         tinyxml2/tinyxml2.cpp)
 target_compile_options(

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

Summary of changes:
 src/deps/CMakeLists.txt        | 2 +-
 tests/xmltester/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GEOS