Skip to content

Commit

Permalink
Add in CMake artifacts necessary to build/check in the
Browse files Browse the repository at this point in the history
autotools-generated tarball
  • Loading branch information
pramsey committed Oct 3, 2019
1 parent bbb3b23 commit 2eb5d9d
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 13 deletions.
3 changes: 3 additions & 0 deletions HOWTO_RELEASE
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 7 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 10 additions & 1 deletion benchmarks/algorithm/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
12 changes: 10 additions & 2 deletions benchmarks/capi/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,21 @@ 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

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
9 changes: 5 additions & 4 deletions doc/Makefile.am
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -22,4 +22,5 @@ doxygen-html apidoc doxygen: Doxyfile
clean-local:
rm -Rf doxygen_docs

EXTRA_DIST = Doxyfile
EXTRA_DIST = Doxyfile \
CMakeLists.txt
4 changes: 3 additions & 1 deletion tools/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions tools/astyle/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ EXTRA_DIST = \
CMakeLists.txt

noinst_PROGRAMS = astyle
#check_PROGRAMS =
#bin_PROGRAMS = astyle

astyle_SOURCES = \
ASBeautifier.cpp \
Expand Down

0 comments on commit 2eb5d9d

Please sign in to comment.