[geos-commits] r3369 - in trunk: . capi include include/geos src tests tests/bigtest tests/unit tests/xmltester tools

[svn_geos at osgeo.org]

Author: strk
Date: 2011-05-17 13:44:35 -0700 (Tue, 17 May 2011)
New Revision: 3369

Modified:
   trunk/Makefile.am
   trunk/capi/Makefile.am
   trunk/include/Makefile.am
   trunk/include/geos/Makefile.am
   trunk/src/Makefile.am
   trunk/tests/Makefile.am
   trunk/tests/bigtest/Makefile.am
   trunk/tests/unit/Makefile.am
   trunk/tests/xmltester/Makefile.am
   trunk/tools/Makefile.am
Log:
Distribute cmake build scripts. Fixes bug #441.

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2011-05-17 17:04:47 UTC (rev 3368)
+++ trunk/Makefile.am	2011-05-17 20:44:35 UTC (rev 3369)
@@ -19,7 +19,10 @@
     tests   \
     tools
 
-EXTRA_DIST = acsite.m4 makefile.vc nmake.opt autogen.bat
+EXTRA_DIST = acsite.m4 makefile.vc nmake.opt autogen.bat CMakeLists.txt \
+  cmake/modules/CheckPrototypeExists.cmake \
+  cmake/modules/COPYING-CMAKE-SCRIPTS \
+  cmake/cmake_uninstall.cmake.in
 
 ACLOCAL_AMFLAGS = -I macros
 

Modified: trunk/capi/Makefile.am
===================================================================
--- trunk/capi/Makefile.am	2011-05-17 17:04:47 UTC (rev 3368)
+++ trunk/capi/Makefile.am	2011-05-17 20:44:35 UTC (rev 3369)
@@ -31,4 +31,4 @@
 dist-local:
 	cp -p $(DIST_SOURCES) Makefile.am Makefile.in $(distdir)
 
-EXTRA_DIST = geos_c.h
+EXTRA_DIST = geos_c.h CMakeLists.txt

Modified: trunk/include/Makefile.am
===================================================================
--- trunk/include/Makefile.am	2011-05-17 17:04:47 UTC (rev 3368)
+++ trunk/include/Makefile.am	2011-05-17 20:44:35 UTC (rev 3369)
@@ -7,3 +7,5 @@
 
 include_HEADERS = \
     geos.h
+
+EXTRA_DIST = CMakeLists.txt

Modified: trunk/include/geos/Makefile.am
===================================================================
--- trunk/include/geos/Makefile.am	2011-05-17 17:04:47 UTC (rev 3368)
+++ trunk/include/geos/Makefile.am	2011-05-17 20:44:35 UTC (rev 3369)
@@ -16,7 +16,7 @@
     simplify \
     util
 
-EXTRA_DIST = platform.h.vc version.h version.h.vc
+EXTRA_DIST = version.h version.h.vc platform.h.vc platform.h.cmake
 
 geosdir = $(includedir)/geos
 

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2011-05-17 17:04:47 UTC (rev 3368)
+++ trunk/src/Makefile.am	2011-05-17 20:44:35 UTC (rev 3369)
@@ -16,7 +16,7 @@
     simplify \
     util
 
-EXTRA_DIST = Makefile.vc dirlist.mk
+EXTRA_DIST = Makefile.vc dirlist.mk CMakeLists.txt
 
 INCLUDES = -I$(top_srcdir)/include
 

Modified: trunk/tests/Makefile.am
===================================================================
--- trunk/tests/Makefile.am	2011-05-17 17:04:47 UTC (rev 3368)
+++ trunk/tests/Makefile.am	2011-05-17 20:44:35 UTC (rev 3369)
@@ -9,3 +9,5 @@
 	perf        \
     geostest    \
     thread
+
+EXTRA_DIST = CMakeLists.txt

Modified: trunk/tests/bigtest/Makefile.am
===================================================================
--- trunk/tests/bigtest/Makefile.am	2011-05-17 17:04:47 UTC (rev 3368)
+++ trunk/tests/bigtest/Makefile.am	2011-05-17 20:44:35 UTC (rev 3369)
@@ -21,5 +21,5 @@
 INCLUDES = -I$(top_srcdir)/include
 INCLUDES += -I$(top_srcdir)/src/io/markup
 
-#EXTRA_DIST = GeometryTestFactory.cpp
+EXTRA_DIST = CMakeLists.txt
 

Modified: trunk/tests/unit/Makefile.am
===================================================================
--- trunk/tests/unit/Makefile.am	2011-05-17 17:04:47 UTC (rev 3368)
+++ trunk/tests/unit/Makefile.am	2011-05-17 20:44:35 UTC (rev 3369)
@@ -15,7 +15,8 @@
 	tut/tut_reporter.hpp \
 	tut/tut_restartable.hpp \
 	tut/tut_result.hpp \
-	tut/tut_runner.hpp
+	tut/tut_runner.hpp \
+	CMakeLists.txt
 
 
 #noinst_PROGRAMS = geos_unit

Modified: trunk/tests/xmltester/Makefile.am
===================================================================
--- trunk/tests/xmltester/Makefile.am	2011-05-17 17:04:47 UTC (rev 3368)
+++ trunk/tests/xmltester/Makefile.am	2011-05-17 20:44:35 UTC (rev 3369)
@@ -10,7 +10,7 @@
 
 CLEANFILES = testrunner 
 
-EXTRA_DIST = testrunner.sh
+EXTRA_DIST = testrunner.sh CMakeLists.txt
 
 SAFE_XMLTESTS=$(srcdir)/tests/testLeaksBig.xml \
 	$(srcdir)/tests/split.xml \

Modified: trunk/tools/Makefile.am
===================================================================
--- trunk/tools/Makefile.am	2011-05-17 17:04:47 UTC (rev 3368)
+++ trunk/tools/Makefile.am	2011-05-17 20:44:35 UTC (rev 3369)
@@ -2,3 +2,5 @@
 #
 # This file is part of project GEOS (http://trac.osgeo.org/geos/)
 bin_SCRIPTS = geos-config
+
+EXTRA_DIST = CMakeLists.txt