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

[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  dbcd4ecb73d54edc47ec3cd69dbe2223a7195342 (commit)
       via  494846aa2f236925f0ebee43911d396aa17d4b5d (commit)
       via  927e442ab1da361d3f487e2b620a878dd11f191d (commit)
      from  77a07030a76245862b11442f793a58b7b93151a0 (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 dbcd4ecb73d54edc47ec3cd69dbe2223a7195342
Merge: 77a07030a 494846aa2
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Oct 21 16:09:22 2021 -0700

    Merge branch 'manisandro-main' into main


commit 494846aa2f236925f0ebee43911d396aa17d4b5d
Merge: 77a07030a 927e442ab
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Oct 21 16:09:10 2021 -0700

    Merge branch 'main' of https://github.com/manisandro/geos into manisandro-main


commit 927e442ab1da361d3f487e2b620a878dd11f191d
Author: Sandro Mani <manisandro at gmail.com>
Date:   Thu Oct 21 10:56:59 2021 +0200

    Set shared library suffix for mingw builds

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20c890702..b1bdf4954 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -280,6 +280,9 @@ if(BUILD_SHARED_LIBS)
 
   set_target_properties(geos PROPERTIES VERSION ${GEOS_VERSION_NOPATCH})
   set_target_properties(geos PROPERTIES SOVERSION ${GEOS_VERSION_NOPATCH})
+ if(MINGW)
+   set_target_properties(geos PROPERTIES SUFFIX "-${GEOS_VERSION_NOPATCH}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ endif(MINGW)
 endif()
 
 #-----------------------------------------------------------------------------
@@ -293,9 +296,12 @@ if(BUILD_SHARED_LIBS)
     PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,GEOS_DLL_EXPORT,DLL_EXPORT>)
 
   set_target_properties(geos_c PROPERTIES VERSION ${CAPI_VERSION})
-  if(NOT WIN32)
+  if(NOT WIN32 OR MINGW)
     set_target_properties(geos_c PROPERTIES SOVERSION ${CAPI_VERSION_MAJOR})
   endif()
+  if(MINGW)
+    set_target_properties(geos_c PROPERTIES SUFFIX "-${CAPI_VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+  endif(MINGW)
 endif()
 
 add_subdirectory(capi)

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

Summary of changes:
 CMakeLists.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GEOS