[geos-commits] [SCM] GEOS branch master updated. 464eb0e47ce113c2cd9229feee8fb137dc9d3c87

[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  464eb0e47ce113c2cd9229feee8fb137dc9d3c87 (commit)
       via  401b970c2a0ca008589f76164170e1432c6db156 (commit)
      from  b4c9015329451576f3da1a09d8257d962f899193 (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 464eb0e47ce113c2cd9229feee8fb137dc9d3c87
Merge: 401b970 b4c9015
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Nov 27 19:21:48 2020 -0800

    Merge branch 'master' of https://git.osgeo.org/gitea/geos/geos


commit 401b970c2a0ca008589f76164170e1432c6db156
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Nov 27 19:21:32 2020 -0800

    Minor changes to fix up release

diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index ca9450a..eb37369 100644
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -1,5 +1,5 @@
 1. Verify that the versions currently set in Version.txt
-   sense for this release.
+   make sense for this release.
 
     - GEOS_VERSION_PATCH
     - GEOS_VERSION_MINOR
diff --git a/benchmarks/capi/Makefile.am b/benchmarks/capi/Makefile.am
index 4c3618e..9463c3f 100644
--- a/benchmarks/capi/Makefile.am
+++ b/benchmarks/capi/Makefile.am
@@ -9,7 +9,8 @@ top_builddir=@top_builddir@
 check_PROGRAMS = \
 	memleak_mp_prep \
 	GEOSPreparedContainsPerfTest \
-	IntersectionPerfTest
+	IntersectionPerfTest \
+	UnaryOpPerfTest
 
 LIBS = $(top_builddir)/capi/libgeos_c.la
 AM_CPPFLAGS = -I$(top_builddir)/capi -I$(top_srcdir)/include
@@ -23,4 +24,7 @@ GEOSPreparedContainsPerfTest_LDADD = $(top_builddir)/src/libgeos.la
 IntersectionPerfTest_SOURCES = IntersectionPerfTest.cpp
 IntersectionPerfTest_LDADD = $(top_builddir)/src/libgeos.la
 
+UnaryOpPerfTest_SOURCES = UnaryOpPerfTest.cpp
+UnaryOpPerfTest_LDADD = $(top_builddir)/src/libgeos.la
+
 EXTRA_DIST = CMakeLists.txt
diff --git a/tools/Makefile.am b/tools/Makefile.am
index cd4706f..d76ba31 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -4,6 +4,7 @@ bin_SCRIPTS = geos-config
 
 EXTRA_DIST = \
 	CMakeLists.txt \
-	geos-config.cmake
+	geos-config.cmake \
+	geos.pc.cmake
 
 SUBDIRS = astyle

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

Summary of changes:
 HOWTO_RELEASE               | 2 +-
 benchmarks/capi/Makefile.am | 6 +++++-
 tools/Makefile.am           | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GEOS