[geos-commits] [SCM] GEOS branch 3.7 updated. 428baa1ea50821c0eb343e238a2e0b959fe95616

[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, 3.7 has been updated
       via  428baa1ea50821c0eb343e238a2e0b959fe95616 (commit)
       via  b50468f9813383a65c286d0126d45c2cf9142220 (commit)
       via  8f3681c39b24fd7d0b1c47f2e01447cb5384a10a (commit)
      from  55011eb38d6db4c3f89afc419e3137c7d806fa52 (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 428baa1ea50821c0eb343e238a2e0b959fe95616
Merge: 55011eb b50468f
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Dec 11 14:46:41 2020 +0100

    Merge tag '3.7.3' into 3.7


commit b50468f9813383a65c286d0126d45c2cf9142220
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Oct 4 22:20:25 2019 +0000

    Harmonize cmake/autotools build targets

diff --git a/tests/perf/capi/CMakeLists.txt b/tests/perf/capi/CMakeLists.txt
index 9019629..37c6674 100644
--- a/tests/perf/capi/CMakeLists.txt
+++ b/tests/perf/capi/CMakeLists.txt
@@ -17,7 +17,7 @@ target_link_libraries(perf_memleak_mp_prep geos_c)
 
 add_test(perf_memleak_mp_prep ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/perf_memleak_mp_prep)
 
-add_test(perf_memleak_mp_prep ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/perf_memleak_mp_prep)
+add_test(perf_intersection ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/perf_intersection)
 
 add_executable(perf_intersection IntersectionPerfTest.cpp)
 target_link_libraries(perf_intersection geos_c)
diff --git a/tests/perf/capi/Makefile.am b/tests/perf/capi/Makefile.am
index bd04df0..167928b 100644
--- a/tests/perf/capi/Makefile.am
+++ b/tests/perf/capi/Makefile.am
@@ -6,7 +6,7 @@ prefix=@prefix@
 top_srcdir=@top_srcdir@
 top_builddir=@top_builddir@
 
-check_PROGRAMS = memleak_mp_prep
+check_PROGRAMS = memleak_mp_prep perf_intersection
 
 LIBS = $(top_builddir)/capi/libgeos_c.la
 AM_CPPFLAGS = -I$(top_builddir)/capi -I$(top_srcdir)/include
@@ -14,5 +14,8 @@ AM_CPPFLAGS = -I$(top_builddir)/capi -I$(top_srcdir)/include
 memleak_mp_prep_SOURCES = memleak_mp_prep.c
 memleak_mp_prep_LDADD = $(LIBS)
 
+perf_intersection_SOURCES = IntersectionPerfTest.cpp
+perf_intersection_LDADD = $(LIBS)
+
 EXTRA_DIST = CMakeLists.txt
 

commit 8f3681c39b24fd7d0b1c47f2e01447cb5384a10a
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Oct 4 21:41:34 2019 +0000

    Version setting for release

diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index 39a4b93..d3f6036 100644
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -37,7 +37,6 @@
         [ THIS MUST BE CAREFULLY AVOIDED ]
     - In main CMakeLists.txt main one
        - CHANGE the line: project(GEOS VERSION <mayor>.<minor>.<micro> LANGUAGES C CXX)
-       - CHANGE the line: set(GEOS_VERSION_PATCH "${GEOS_VERSION_PATCH}dev")
        - CAPI_INTERFACE_*
 
     - In README.md make sure all links are pointing at new bot branches
diff --git a/NEWS b/NEWS
index 3e0dee5..a18f2e2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
-Changes in 3.7.3dev
-2019-XX-XX
+Changes in 3.7.3
+2019-10-04
 
 - Bug fixes / improvements
   - Union performance regression (#867, Paul Ramsey)
diff --git a/capi/geos_c.h.in b/capi/geos_c.h.in
index f665e1c..7556206 100644
--- a/capi/geos_c.h.in
+++ b/capi/geos_c.h.in
@@ -61,7 +61,7 @@ extern "C" {
 #define GEOS_CAPI_VERSION_MAJOR 1
 #define GEOS_CAPI_VERSION_MINOR 11
 #define GEOS_CAPI_VERSION_PATCH 0
-#define GEOS_CAPI_VERSION "3.7.3-CAPI-1.11.0"
+#define GEOS_CAPI_VERSION "3.7.3-CAPI-1.11.3"
 #else
 #ifndef GEOS_VERSION_MAJOR
 #define GEOS_VERSION_MAJOR @VERSION_MAJOR@
diff --git a/configure.ac b/configure.ac
index 659c612..985a88d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl -- encoding ABI break at every release
 dnl
 VERSION_MAJOR=3
 VERSION_MINOR=7
-VERSION_PATCH=3dev
+VERSION_PATCH=3
 VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
 VERSION_RELEASE=`echo "$VERSION" | sed -E 's/^([[0-9]+\.[0-9]+\.[0-9]+]).*$/\1/'`
 

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

Summary of changes:
 HOWTO_RELEASE                  | 1 -
 NEWS                           | 4 ++--
 capi/geos_c.h.in               | 2 +-
 configure.ac                   | 2 +-
 tests/perf/capi/CMakeLists.txt | 2 +-
 tests/perf/capi/Makefile.am    | 5 ++++-
 6 files changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GEOS