[geos-commits] [SCM] GEOS branch master updated. 2eb5d9d48beb3c105d548cebd23a19940ce29949

Thu Oct 3 09:36:46 PDT 2019

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  2eb5d9d48beb3c105d548cebd23a19940ce29949 (commit)
      from  bbb3b23e0512d394264e169da74b10b7614a60b1 (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 2eb5d9d48beb3c105d548cebd23a19940ce29949
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Oct 3 09:36:20 2019 -0700

    Add in CMake artifacts necessary to build/check in the
    autotools-generated tarball

diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index ae43d6d..893e1a8 100644
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -26,6 +26,9 @@
 
 6. Verify that you can un-pack and build the tarball.
 
+   - autotools: ./configure && make check
+   - cmake: mkdir build && cd build && cmake .. && make && make check
+
 7. Copy the tarball to upload.osgeo.org:/osgeo/download/geos
 
 8. Tag the release:
diff --git a/Makefile.am b/Makefile.am
index 3731ec7..dbc7451 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,11 +25,15 @@ SUBDIRS = \
 
 BUILT_SOURCES =
 
-EXTRA_DIST = acsite.m4 .editorconfig \
-	Version.txt CMakeLists.txt \
+EXTRA_DIST = \
+	README.md \
+	acsite.m4 \
+	.editorconfig \
+	Version.txt \
+	CMakeLists.txt \
 	cmake/cmake_uninstall.cmake.in \
 	cmake/geos-config.cmake \
-	README.md
+	cmake/FindMakeDistCheck.cmake
 
 ACLOCAL_AMFLAGS = -I macros
 
diff --git a/benchmarks/algorithm/Makefile.am b/benchmarks/algorithm/Makefile.am
index 64242fe..226f3d8 100644
--- a/benchmarks/algorithm/Makefile.am
+++ b/benchmarks/algorithm/Makefile.am
@@ -5,11 +5,20 @@ prefix=@prefix@
 top_srcdir=@top_srcdir@
 top_builddir=@top_builddir@
 
-noinst_PROGRAMS = InteriorPointAreaPerfTest
+noinst_PROGRAMS = \
+	InteriorPointAreaPerfTest \
+	VoronoiPerfTest \
+	UnaryUnionSegmentsPerfTest
 
 InteriorPointAreaPerfTest_SOURCES = InteriorPointAreaPerfTest.cpp
 InteriorPointAreaPerfTest_LDADD = $(top_builddir)/src/libgeos.la
 
+VoronoiPerfTest_SOURCES = VoronoiPerfTest.cpp
+VoronoiPerfTest_LDADD = $(top_builddir)/src/libgeos.la
+
+UnaryUnionSegmentsPerfTest_SOURCES = UnaryUnionSegmentsPerfTest.cpp
+UnaryUnionSegmentsPerfTest_LDADD = $(top_builddir)/src/libgeos.la
+
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/src/io/markup
 
diff --git a/benchmarks/capi/Makefile.am b/benchmarks/capi/Makefile.am
index bd04df0..4c3618e 100644
--- a/benchmarks/capi/Makefile.am
+++ b/benchmarks/capi/Makefile.am
@@ -6,7 +6,10 @@ prefix=@prefix@
 top_srcdir=@top_srcdir@
 top_builddir=@top_builddir@
 
-check_PROGRAMS = memleak_mp_prep
+check_PROGRAMS = \
+	memleak_mp_prep \
+	GEOSPreparedContainsPerfTest \
+	IntersectionPerfTest
 
 LIBS = $(top_builddir)/capi/libgeos_c.la
 AM_CPPFLAGS = -I$(top_builddir)/capi -I$(top_srcdir)/include
@@ -14,5 +17,10 @@ AM_CPPFLAGS = -I$(top_builddir)/capi -I$(top_srcdir)/include
 memleak_mp_prep_SOURCES = memleak_mp_prep.c
 memleak_mp_prep_LDADD = $(LIBS)
 
-EXTRA_DIST = CMakeLists.txt
+GEOSPreparedContainsPerfTest_SOURCES = GEOSPreparedContainsPerfTest.cpp
+GEOSPreparedContainsPerfTest_LDADD = $(top_builddir)/src/libgeos.la
+
+IntersectionPerfTest_SOURCES = IntersectionPerfTest.cpp
+IntersectionPerfTest_LDADD = $(top_builddir)/src/libgeos.la
 
+EXTRA_DIST = CMakeLists.txt
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c07073c..31723d3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,15 +1,15 @@
 #
-# This file is part of project GEOS (http://trac.osgeo.org/geos/) 
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
 #
 prefix=@prefix@
 top_srcdir=@top_srcdir@
 top_builddir=@top_builddir@
 
-noinst_PROGRAMS = example 
+noinst_PROGRAMS = example
 
 LIBS = $(top_builddir)/src/libgeos.la
 
-example_SOURCES = example.cpp 
+example_SOURCES = example.cpp
 example_LDADD = $(LIBS)
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
@@ -22,4 +22,5 @@ doxygen-html apidoc doxygen: Doxyfile
 clean-local:
 	rm -Rf doxygen_docs
 
-EXTRA_DIST = Doxyfile
+EXTRA_DIST = Doxyfile \
+	CMakeLists.txt
diff --git a/tools/Makefile.am b/tools/Makefile.am
index f0dff5b..cd4706f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,6 +2,8 @@
 # This file is part of project GEOS (http://trac.osgeo.org/geos/)
 bin_SCRIPTS = geos-config
 
-EXTRA_DIST = CMakeLists.txt
+EXTRA_DIST = \
+	CMakeLists.txt \
+	geos-config.cmake
 
 SUBDIRS = astyle
diff --git a/tools/astyle/Makefile.am b/tools/astyle/Makefile.am
index 432eb11..30ec858 100644
--- a/tools/astyle/Makefile.am
+++ b/tools/astyle/Makefile.am
@@ -10,8 +10,6 @@ EXTRA_DIST = \
 	CMakeLists.txt
 
 noinst_PROGRAMS = astyle
-#check_PROGRAMS =
-#bin_PROGRAMS = astyle
 
 astyle_SOURCES = \
 	ASBeautifier.cpp \

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

Summary of changes:
 HOWTO_RELEASE                    |  3 +++
 Makefile.am                      | 10 +++++++---
 benchmarks/algorithm/Makefile.am | 11 ++++++++++-
 benchmarks/capi/Makefile.am      | 12 ++++++++++--
 doc/Makefile.am                  |  9 +++++----
 tools/Makefile.am                |  4 +++-
 tools/astyle/Makefile.am         |  2 --
 7 files changed, 38 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
GEOS
