[geos-commits] [SCM] GEOS branch master updated. a67be9b65839913fc2514f6ef77ff8e5e6b180cf
git at osgeo.org
git at osgeo.org
Fri May 24 14:55:47 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 a67be9b65839913fc2514f6ef77ff8e5e6b180cf (commit)
via b41859af9e6829647305883712eb3a81bc4150f6 (commit)
via bacf81826199943cd6f697c5a14db79a7e9ad598 (commit)
via 083c08bdd830190aee0b4ff92477ca2e960bf022 (commit)
via fd44e762caa064440e4c0e7874e24dd271c58cec (commit)
via 0c3239d8c3b9a3bdbf0e7949dcb89bea999991d2 (commit)
from 39ce10ea7fb7891b6c4f5a241c83a8dc46f8a1c7 (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 a67be9b65839913fc2514f6ef77ff8e5e6b180cf
Merge: b41859a 39ce10e
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Fri May 24 14:55:16 2019 -0700
Merge branch 'master' of https://git.osgeo.org/gogs/geos/geos
commit b41859af9e6829647305883712eb3a81bc4150f6
Merge: bacf818 0c3239d
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Fri May 24 14:54:59 2019 -0700
Merge branch 'ml/cmake-disable-autotoolization-for-multiconfs'
diff --cc CMakeLists.txt
index b44a713,bc5a1d8..2547113
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -296,47 -279,47 +296,53 @@@ add_custom_target(uninstal
#-----------------------------------------------------------------------------
# "make dist" workalike
#-----------------------------------------------------------------------------
-
- set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GEOS Computational Geometry Library")
- set(CPACK_PACKAGE_VENDOR "OSGeo")
- set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README.md)
- set(CPACK_SOURCE_GENERATOR "TBZ2")
- set(CPACK_PACKAGE_VERSION_MAJOR ${GEOS_VERSION_MAJOR})
- set(CPACK_PACKAGE_VERSION_MINOR ${GEOS_VERSION_MINOR})
- set(CPACK_PACKAGE_VERSION_PATCH ${GEOS_VERSION_PATCH})
- set(CPACK_SOURCE_PACKAGE_FILE_NAME "geos-${GEOS_VERSION_FULL}")
-
- set(CPACK_SOURCE_IGNORE_FILES
- "/\\\\.git"
- "/autogen\\\\.sh"
- "/tools/ci"
- "/HOWTO_RELEASE"
- "/autom4te\\\\.cache"
- "\\\\.yml\$"
- "\\\\.deps"
- "/debian/"
- "/php/"
- "/.*build-.*/"
- ${PROJECT_BINARY_DIR}
- )
-
- # message(STATUS "GEOS: CPACK_SOURCE_PACKAGE_FILE_NAME: ${CPACK_SOURCE_PACKAGE_FILE_NAME}")
- # message(STATUS "GEOS: CPACK_SOURCE_IGNORE_FILES: ${CPACK_SOURCE_IGNORE_FILES}")
- # message(STATUS "GEOS: CMAKE_MODULE_PATH: ${CMAKE_MODULE_PATH}")
- include(CPack)
- add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+ get_property(_is_multi_config_generator GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+ if(NOT _is_multi_config_generator)
+ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GEOS Computational Geometry Library")
+ set(CPACK_PACKAGE_VENDOR "OSGeo")
+ set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README.md)
+ set(CPACK_SOURCE_GENERATOR "TBZ2")
+ set(CPACK_PACKAGE_VERSION_MAJOR ${GEOS_VERSION_MAJOR})
+ set(CPACK_PACKAGE_VERSION_MINOR ${GEOS_VERSION_MINOR})
+ set(CPACK_PACKAGE_VERSION_PATCH ${GEOS_VERSION_PATCH})
+ set(CPACK_SOURCE_PACKAGE_FILE_NAME "geos-${GEOS_VERSION_FULL}")
+
+ set(CPACK_SOURCE_IGNORE_FILES
+ "/\\\\.git"
+ "/autogen\\\\.sh"
+ "/tools/ci"
+ "/HOWTO_RELEASE"
+ "/autom4te\\\\.cache"
+ "\\\\.yml\$"
+ "\\\\.deps"
+ "/debian/"
+ "/php/"
+ "/.*build-.*/"
+ ${PROJECT_BINARY_DIR}
+ )
+
+ # message(STATUS "GEOS: CPACK_SOURCE_PACKAGE_FILE_NAME: ${CPACK_SOURCE_PACKAGE_FILE_NAME}")
+ # message(STATUS "GEOS: CPACK_SOURCE_IGNORE_FILES: ${CPACK_SOURCE_IGNORE_FILES}")
+ # message(STATUS "GEOS: CMAKE_MODULE_PATH: ${CMAKE_MODULE_PATH}")
+ include(CPack)
+ add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+
+ message(STATUS "GEOS: Configured 'dist' target")
+ endif()
#-----------------------------------------------------------------------------
+# "make check" workalike
+#-----------------------------------------------------------------------------
+
+add_custom_target(check COMMAND ${CMAKE_BUILD_TOOL} test)
+
+#-----------------------------------------------------------------------------
# "make distcheck" workalike
#-----------------------------------------------------------------------------
+ if(NOT _is_multi_config_generator)
+ find_package(MakeDistCheck)
+ AddMakeDistCheck()
+ message(STATUS "GEOS: Configured 'distcheck' target")
+ endif()
- find_package(MakeDistCheck)
- AddMakeDistCheck()
-
-
+ unset(_is_multi_config_generator)
commit bacf81826199943cd6f697c5a14db79a7e9ad598
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Fri May 24 14:52:48 2019 -0700
Fix up autotools build after reorg of benchmark files
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54962db..b44a713 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -327,6 +327,12 @@ include(CPack)
add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
#-----------------------------------------------------------------------------
+# "make check" workalike
+#-----------------------------------------------------------------------------
+
+add_custom_target(check COMMAND ${CMAKE_BUILD_TOOL} test)
+
+#-----------------------------------------------------------------------------
# "make distcheck" workalike
#-----------------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 9f8991e..08598c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,7 @@ SUBDIRS = \
macros \
swig \
tests \
+ benchmarks \
tools
BUILT_SOURCES = geos_revision.h
diff --git a/benchmarks/algorithm/Makefile.am b/benchmarks/algorithm/Makefile.am
index d7560d6..64242fe 100644
--- a/benchmarks/algorithm/Makefile.am
+++ b/benchmarks/algorithm/Makefile.am
@@ -7,10 +7,8 @@ top_builddir=@top_builddir@
noinst_PROGRAMS = InteriorPointAreaPerfTest
-LIBS = $(top_builddir)/src/libgeos.la
-
InteriorPointAreaPerfTest_SOURCES = InteriorPointAreaPerfTest.cpp
-InteriorPointAreaPerfTest_LDADD = $(LIBS)
+InteriorPointAreaPerfTest_LDADD = $(top_builddir)/src/libgeos.la
AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CPPFLAGS += -I$(top_srcdir)/src/io/markup
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0e3cec5..9f5e00e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,6 @@ SUBDIRS = \
bigtest \
xmltester \
unit \
- benchmarks \
geostest \
thread
commit 083c08bdd830190aee0b4ff92477ca2e960bf022
Merge: e5d9a68 fd44e76
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Fri May 24 14:14:05 2019 -0700
Merge branch 'ml/move-perf-to-benchmark'
commit fd44e762caa064440e4c0e7874e24dd271c58cec
Author: Mateusz Łoskot <mateusz at loskot.net>
Date: Fri May 24 10:14:53 2019 +0200
Move tests/perf to new benchmarks directory
As perf programs are not intended for execution as part of tests,
they already have been filtered out. Reflecting this fact in code
structure seems appropriate.
Additionally, rationalise names of `add_test`-created tests as
`test_{unit|xml}` to clear confusion with target names of executable
and remove superfluous `geos` part.
diff --git a/.gitignore b/.gitignore
index 85214c8..7e9ffb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,10 +36,10 @@ tools/astyle/astyle
tests/bigtest/TestSweepLineSpeed
tests/bigtest/bug234
tests/geostest/geostest
-tests/perf/operation/buffer/IteratedBufferStressTest
-tests/perf/operation/predicate/RectangleIntersectsPerfTest
-tests/perf/capi/memleak_mp_prep
-tests/perf/ClassSizes
+benchmarks/operation/buffer/IteratedBufferStressTest
+benchmarks/operation/predicate/RectangleIntersectsPerfTest
+benchmarks/capi/memleak_mp_prep
+benchmarks/ClassSizes
include/geos/platform.h
include/geos/platform.h.disabled
include/geos/stamp-h2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2937297..ee5eb39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,6 +227,11 @@ if(BUILD_TESTING)
endif()
#-----------------------------------------------------------------------------
+# Benchmarks
+#-----------------------------------------------------------------------------
+add_subdirectory(benchmarks)
+
+#-----------------------------------------------------------------------------
# Install and export targets - support 'make install' or equivalent
#-----------------------------------------------------------------------------
include(CMakePackageConfigHelpers)
diff --git a/tests/perf/CMakeLists.txt b/benchmarks/CMakeLists.txt
similarity index 74%
rename from tests/perf/CMakeLists.txt
rename to benchmarks/CMakeLists.txt
index 11dc524..7551373 100644
--- a/tests/perf/CMakeLists.txt
+++ b/benchmarks/CMakeLists.txt
@@ -8,9 +8,8 @@
# by the Free Software Foundation.
# See the COPYING file for more information.
################################################################################
-add_executable(test_perf_class_sizes ClassSizes.cpp)
-target_link_libraries(test_perf_class_sizes PRIVATE geos)
-add_test(NAME test_perf_class_sizes COMMAND test_perf_class_sizes)
+add_executable(perf_class_sizes ClassSizes.cpp)
+target_link_libraries(perf_class_sizes PRIVATE geos)
add_subdirectory(operation)
add_subdirectory(capi)
diff --git a/tests/perf/ClassSizes.cpp b/benchmarks/ClassSizes.cpp
similarity index 100%
rename from tests/perf/ClassSizes.cpp
rename to benchmarks/ClassSizes.cpp
diff --git a/tests/perf/Makefile.am b/benchmarks/Makefile.am
similarity index 100%
rename from tests/perf/Makefile.am
rename to benchmarks/Makefile.am
diff --git a/tests/perf/algorithm/CMakeLists.txt b/benchmarks/algorithm/CMakeLists.txt
similarity index 89%
rename from tests/perf/algorithm/CMakeLists.txt
rename to benchmarks/algorithm/CMakeLists.txt
index 7272dd0..5a0703e 100644
--- a/tests/perf/algorithm/CMakeLists.txt
+++ b/benchmarks/algorithm/CMakeLists.txt
@@ -1,6 +1,6 @@
#################################################################################
#
-# CMake configuration for GEOS perf/operation/predicate tests
+# CMake configuration for GEOS benchmarks/operation/predicate tests
#
# Copyright (C) 2017 Mateusz Loskot <mateusz at loskot.net>
#
@@ -10,8 +10,5 @@
# See the COPYING file for more information.
#
#################################################################################
-
add_executable(perf_interiorpoint_area InteriorPointAreaPerfTest.cpp)
-
target_link_libraries(perf_interiorpoint_area geos)
-
diff --git a/tests/perf/algorithm/InteriorPointAreaPerfTest.cpp b/benchmarks/algorithm/InteriorPointAreaPerfTest.cpp
similarity index 100%
rename from tests/perf/algorithm/InteriorPointAreaPerfTest.cpp
rename to benchmarks/algorithm/InteriorPointAreaPerfTest.cpp
diff --git a/tests/perf/algorithm/Makefile.am b/benchmarks/algorithm/Makefile.am
similarity index 100%
rename from tests/perf/algorithm/Makefile.am
rename to benchmarks/algorithm/Makefile.am
diff --git a/tests/perf/capi/CMakeLists.txt b/benchmarks/capi/CMakeLists.txt
similarity index 73%
rename from tests/perf/capi/CMakeLists.txt
rename to benchmarks/capi/CMakeLists.txt
index 3b85d89..7a5d849 100644
--- a/tests/perf/capi/CMakeLists.txt
+++ b/benchmarks/capi/CMakeLists.txt
@@ -8,12 +8,11 @@
# by the Free Software Foundation.
# See the COPYING file for more information.
################################################################################
-add_executable(test_perf_memleak_mp_prep memleak_mp_prep.c)
+add_executable(perf_memleak_mp_prep memleak_mp_prep.c)
# test_perf_memleak_mp_prep is not dependant against geos target,
# but geos_c only, so need explicit include directories.
-target_include_directories(test_perf_memleak_mp_prep
+target_include_directories(perf_memleak_mp_prep
PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
-target_link_libraries(test_perf_memleak_mp_prep PRIVATE geos_c)
-add_test(NAME test_perf_memleak_mp_prep COMMAND test_perf_memleak_mp_prep)
+target_link_libraries(perf_memleak_mp_prep PRIVATE geos_c)
diff --git a/tests/perf/capi/Makefile.am b/benchmarks/capi/Makefile.am
similarity index 100%
rename from tests/perf/capi/Makefile.am
rename to benchmarks/capi/Makefile.am
diff --git a/tests/perf/capi/memleak_mp_prep.c b/benchmarks/capi/memleak_mp_prep.c
similarity index 100%
rename from tests/perf/capi/memleak_mp_prep.c
rename to benchmarks/capi/memleak_mp_prep.c
diff --git a/tests/perf/capi/memleak_mp_prep.sh b/benchmarks/capi/memleak_mp_prep.sh
similarity index 100%
rename from tests/perf/capi/memleak_mp_prep.sh
rename to benchmarks/capi/memleak_mp_prep.sh
diff --git a/tests/perf/operation/CMakeLists.txt b/benchmarks/operation/CMakeLists.txt
similarity index 100%
copy from tests/perf/operation/CMakeLists.txt
copy to benchmarks/operation/CMakeLists.txt
diff --git a/tests/perf/operation/Makefile.am b/benchmarks/operation/Makefile.am
similarity index 100%
rename from tests/perf/operation/Makefile.am
rename to benchmarks/operation/Makefile.am
diff --git a/tests/perf/operation/buffer/CMakeLists.txt b/benchmarks/operation/buffer/CMakeLists.txt
similarity index 69%
rename from tests/perf/operation/buffer/CMakeLists.txt
rename to benchmarks/operation/buffer/CMakeLists.txt
index de937de..abc0e03 100644
--- a/tests/perf/operation/buffer/CMakeLists.txt
+++ b/benchmarks/operation/buffer/CMakeLists.txt
@@ -8,6 +8,5 @@
# by the Free Software Foundation.
# See the COPYING file for more information.
################################################################################
-add_executable(test_perf_iterated_buffer IteratedBufferStressTest.cpp)
-target_link_libraries(test_perf_iterated_buffer PRIVATE geos)
-add_test(NAME test_perf_iterated_buffer COMMAND test_perf_iterated_buffer)
+add_executable(perf_iterated_buffer IteratedBufferStressTest.cpp)
+target_link_libraries(perf_iterated_buffer PRIVATE geos)
diff --git a/tests/perf/operation/buffer/IteratedBufferStressTest.cpp b/benchmarks/operation/buffer/IteratedBufferStressTest.cpp
similarity index 100%
rename from tests/perf/operation/buffer/IteratedBufferStressTest.cpp
rename to benchmarks/operation/buffer/IteratedBufferStressTest.cpp
diff --git a/tests/perf/operation/buffer/Makefile.am b/benchmarks/operation/buffer/Makefile.am
similarity index 100%
rename from tests/perf/operation/buffer/Makefile.am
rename to benchmarks/operation/buffer/Makefile.am
diff --git a/tests/perf/operation/CMakeLists.txt b/benchmarks/operation/predicate/CMakeLists.txt
similarity index 77%
rename from tests/perf/operation/CMakeLists.txt
rename to benchmarks/operation/predicate/CMakeLists.txt
index 10b0eb4..1ead38f 100644
--- a/tests/perf/operation/CMakeLists.txt
+++ b/benchmarks/operation/predicate/CMakeLists.txt
@@ -8,5 +8,5 @@
# by the Free Software Foundation.
# See the COPYING file for more information.
################################################################################
-add_subdirectory(buffer)
-add_subdirectory(predicate)
+add_executable(perf_rectangle_intersects RectangleIntersectsPerfTest.cpp)
+target_link_libraries(perf_rectangle_intersects PRIVATE geos)
diff --git a/tests/perf/operation/predicate/Makefile.am b/benchmarks/operation/predicate/Makefile.am
similarity index 100%
rename from tests/perf/operation/predicate/Makefile.am
rename to benchmarks/operation/predicate/Makefile.am
diff --git a/tests/perf/operation/predicate/RectangleIntersectsPerfTest.cpp b/benchmarks/operation/predicate/RectangleIntersectsPerfTest.cpp
similarity index 100%
rename from tests/perf/operation/predicate/RectangleIntersectsPerfTest.cpp
rename to benchmarks/operation/predicate/RectangleIntersectsPerfTest.cpp
diff --git a/configure.ac b/configure.ac
index e690548..0ea9689 100644
--- a/configure.ac
+++ b/configure.ac
@@ -494,12 +494,12 @@ AC_OUTPUT([
tests/Makefile
tests/bigtest/Makefile
tests/unit/Makefile
- tests/perf/Makefile
- tests/perf/algorithm/Makefile
- tests/perf/operation/Makefile
- tests/perf/operation/buffer/Makefile
- tests/perf/operation/predicate/Makefile
- tests/perf/capi/Makefile
+ benchmarks/Makefile
+ benchmarks/algorithm/Makefile
+ benchmarks/operation/Makefile
+ benchmarks/operation/buffer/Makefile
+ benchmarks/operation/predicate/Makefile
+ benchmarks/capi/Makefile
tests/xmltester/Makefile
tests/geostest/Makefile
tests/thread/Makefile
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c9d8883..1450651 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -8,12 +8,7 @@
# by the Free Software Foundation.
# See the COPYING file for more information.
################################################################################
-add_custom_target(check COMMAND ctest --exclude-regex perf
- DEPENDS )
-
add_subdirectory(unit)
add_subdirectory(xmltester)
add_subdirectory(bigtest)
-# perf tests are built but not run by default
-add_subdirectory(perf)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2015d41..0e3cec5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,11 +1,11 @@
#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
#
SUBDIRS = \
bigtest \
xmltester \
unit \
- perf \
+ benchmarks \
geostest \
thread
diff --git a/tests/bigtest/CMakeLists.txt b/tests/bigtest/CMakeLists.txt
index c8759ae..7d20ad7 100644
--- a/tests/bigtest/CMakeLists.txt
+++ b/tests/bigtest/CMakeLists.txt
@@ -9,7 +9,7 @@
# See the COPYING file for more information.
################################################################################
-add_executable(test_sweep_line_speed
+add_executable(test_big_sweep_line_speed
TestSweepLineSpeed.cpp
GeometryTestFactory.cpp)
-target_link_libraries(test_sweep_line_speed PRIVATE geos)
+target_link_libraries(test_big_sweep_line_speed PRIVATE geos)
diff --git a/tests/perf/operation/predicate/CMakeLists.txt b/tests/perf/operation/predicate/CMakeLists.txt
deleted file mode 100644
index 2ce3624..0000000
--- a/tests/perf/operation/predicate/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-# Part of CMake configuration for GEOS
-#
-# Copyright (C) 2018 Mateusz Loskot <mateusz at loskot.net>
-#
-# This is free software; you can redistribute and/or modify it under
-# the terms of the GNU Lesser General Public Licence as published
-# by the Free Software Foundation.
-# See the COPYING file for more information.
-################################################################################
-add_executable(test_perf_rectangle_intersects RectangleIntersectsPerfTest.cpp)
-target_link_libraries(test_perf_rectangle_intersects PRIVATE geos)
-add_test(NAME test_perf_rectangle_intersects COMMAND test_perf_rectangle_intersects)
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 307b561..a36e227 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -17,4 +17,4 @@ target_include_directories(test_geos_unit
PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>)
-add_test(NAME test_geos_unit COMMAND test_geos_unit)
+add_test(NAME test_unit COMMAND test_geos_unit)
diff --git a/tests/xmltester/CMakeLists.txt b/tests/xmltester/CMakeLists.txt
index 2f49cf1..f334d0d 100644
--- a/tests/xmltester/CMakeLists.txt
+++ b/tests/xmltester/CMakeLists.txt
@@ -25,5 +25,5 @@ target_include_directories(test_xmltester
file(GLOB_RECURSE _tests ${CMAKE_CURRENT_LIST_DIR}/tests/*.xml CONFIGURE_DEPEND)
list(FILTER _tests EXCLUDE REGEX failure)
-add_test(NAME test_xmltester COMMAND test_xmltester --test-valid-output ${_tests})
+add_test(NAME test_xml COMMAND test_xmltester --test-valid-output ${_tests})
unset(_tests)
commit 0c3239d8c3b9a3bdbf0e7949dcb89bea999991d2
Author: Mateusz Łoskot <mateusz at loskot.net>
Date: Fri May 24 15:12:49 2019 +0200
Disable dist and distcheck targets for multi-configuration generators
Those targets are useless for the IDEs.
Those targets have also potential to be troublesome for the IDEs.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2937297..bc5a1d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -279,41 +279,47 @@ add_custom_target(uninstall
#-----------------------------------------------------------------------------
# "make dist" workalike
#-----------------------------------------------------------------------------
-
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GEOS Computational Geometry Library")
-set(CPACK_PACKAGE_VENDOR "OSGeo")
-set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README.md)
-set(CPACK_SOURCE_GENERATOR "TBZ2")
-set(CPACK_PACKAGE_VERSION_MAJOR ${GEOS_VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR ${GEOS_VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${GEOS_VERSION_PATCH})
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "geos-${GEOS_VERSION_FULL}")
-
-set(CPACK_SOURCE_IGNORE_FILES
- "/\\\\.git"
- "/autogen\\\\.sh"
- "/tools/ci"
- "/HOWTO_RELEASE"
- "/autom4te\\\\.cache"
- "\\\\.yml\$"
- "\\\\.deps"
- "/debian/"
- "/php/"
- "/.*build-.*/"
- ${PROJECT_BINARY_DIR}
- )
-
-# message(STATUS "GEOS: CPACK_SOURCE_PACKAGE_FILE_NAME: ${CPACK_SOURCE_PACKAGE_FILE_NAME}")
-# message(STATUS "GEOS: CPACK_SOURCE_IGNORE_FILES: ${CPACK_SOURCE_IGNORE_FILES}")
-# message(STATUS "GEOS: CMAKE_MODULE_PATH: ${CMAKE_MODULE_PATH}")
-include(CPack)
-add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+get_property(_is_multi_config_generator GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+if(NOT _is_multi_config_generator)
+ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GEOS Computational Geometry Library")
+ set(CPACK_PACKAGE_VENDOR "OSGeo")
+ set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README.md)
+ set(CPACK_SOURCE_GENERATOR "TBZ2")
+ set(CPACK_PACKAGE_VERSION_MAJOR ${GEOS_VERSION_MAJOR})
+ set(CPACK_PACKAGE_VERSION_MINOR ${GEOS_VERSION_MINOR})
+ set(CPACK_PACKAGE_VERSION_PATCH ${GEOS_VERSION_PATCH})
+ set(CPACK_SOURCE_PACKAGE_FILE_NAME "geos-${GEOS_VERSION_FULL}")
+
+ set(CPACK_SOURCE_IGNORE_FILES
+ "/\\\\.git"
+ "/autogen\\\\.sh"
+ "/tools/ci"
+ "/HOWTO_RELEASE"
+ "/autom4te\\\\.cache"
+ "\\\\.yml\$"
+ "\\\\.deps"
+ "/debian/"
+ "/php/"
+ "/.*build-.*/"
+ ${PROJECT_BINARY_DIR}
+ )
+
+ # message(STATUS "GEOS: CPACK_SOURCE_PACKAGE_FILE_NAME: ${CPACK_SOURCE_PACKAGE_FILE_NAME}")
+ # message(STATUS "GEOS: CPACK_SOURCE_IGNORE_FILES: ${CPACK_SOURCE_IGNORE_FILES}")
+ # message(STATUS "GEOS: CMAKE_MODULE_PATH: ${CMAKE_MODULE_PATH}")
+ include(CPack)
+ add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+
+ message(STATUS "GEOS: Configured 'dist' target")
+endif()
#-----------------------------------------------------------------------------
# "make distcheck" workalike
#-----------------------------------------------------------------------------
+if(NOT _is_multi_config_generator)
+ find_package(MakeDistCheck)
+ AddMakeDistCheck()
+ message(STATUS "GEOS: Configured 'distcheck' target")
+endif()
-find_package(MakeDistCheck)
-AddMakeDistCheck()
-
-
+unset(_is_multi_config_generator)
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 8 +--
CMakeLists.txt | 81 +++++++++++++---------
Makefile.am | 1 +
{tests/bigtest => benchmarks}/CMakeLists.txt | 8 +--
{tests/perf => benchmarks}/ClassSizes.cpp | 0
{tests/perf => benchmarks}/Makefile.am | 0
.../perf => benchmarks}/algorithm/CMakeLists.txt | 5 +-
.../algorithm/InteriorPointAreaPerfTest.cpp | 0
{tests/perf => benchmarks}/algorithm/Makefile.am | 4 +-
{tests/perf => benchmarks}/capi/CMakeLists.txt | 7 +-
{tests/perf => benchmarks}/capi/Makefile.am | 0
{tests/perf => benchmarks}/capi/memleak_mp_prep.c | 0
{tests/perf => benchmarks}/capi/memleak_mp_prep.sh | 0
.../perf => benchmarks}/operation/CMakeLists.txt | 0
{tests/perf => benchmarks}/operation/Makefile.am | 0
.../operation/buffer}/CMakeLists.txt | 4 +-
.../operation/buffer/IteratedBufferStressTest.cpp | 0
.../operation/buffer/Makefile.am | 0
.../operation/predicate}/CMakeLists.txt | 5 +-
.../operation/predicate/Makefile.am | 0
.../predicate/RectangleIntersectsPerfTest.cpp | 0
configure.ac | 12 ++--
tests/CMakeLists.txt | 5 --
tests/Makefile.am | 3 +-
tests/bigtest/CMakeLists.txt | 4 +-
tests/perf/CMakeLists.txt | 16 -----
tests/perf/operation/buffer/CMakeLists.txt | 13 ----
tests/perf/operation/predicate/CMakeLists.txt | 13 ----
tests/unit/CMakeLists.txt | 2 +-
tests/xmltester/CMakeLists.txt | 2 +-
30 files changed, 78 insertions(+), 115 deletions(-)
copy {tests/bigtest => benchmarks}/CMakeLists.txt (75%)
rename {tests/perf => benchmarks}/ClassSizes.cpp (100%)
rename {tests/perf => benchmarks}/Makefile.am (100%)
rename {tests/perf => benchmarks}/algorithm/CMakeLists.txt (89%)
rename {tests/perf => benchmarks}/algorithm/InteriorPointAreaPerfTest.cpp (100%)
rename {tests/perf => benchmarks}/algorithm/Makefile.am (81%)
rename {tests/perf => benchmarks}/capi/CMakeLists.txt (73%)
rename {tests/perf => benchmarks}/capi/Makefile.am (100%)
rename {tests/perf => benchmarks}/capi/memleak_mp_prep.c (100%)
rename {tests/perf => benchmarks}/capi/memleak_mp_prep.sh (100%)
copy {tests/perf => benchmarks}/operation/CMakeLists.txt (100%)
rename {tests/perf => benchmarks}/operation/Makefile.am (100%)
rename {tests/perf/operation => benchmarks/operation/buffer}/CMakeLists.txt (79%)
rename {tests/perf => benchmarks}/operation/buffer/IteratedBufferStressTest.cpp (100%)
rename {tests/perf => benchmarks}/operation/buffer/Makefile.am (100%)
copy {src => benchmarks/operation/predicate}/CMakeLists.txt (77%)
rename {tests/perf => benchmarks}/operation/predicate/Makefile.am (100%)
rename {tests/perf => benchmarks}/operation/predicate/RectangleIntersectsPerfTest.cpp (100%)
delete mode 100644 tests/perf/CMakeLists.txt
delete mode 100644 tests/perf/operation/buffer/CMakeLists.txt
delete mode 100644 tests/perf/operation/predicate/CMakeLists.txt
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list