[geos-commits] [SCM] GEOS branch master updated. 4ebb2526bdfbf54febeccbcd7dc6fe592f48c223

[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  4ebb2526bdfbf54febeccbcd7dc6fe592f48c223 (commit)
       via  60f60f75abd598912b495c0641a8118409ddb22a (commit)
      from  ae73bc45bbad44703ed0532b64ed0c2440a9cf90 (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 4ebb2526bdfbf54febeccbcd7dc6fe592f48c223
Merge: 60f60f7 ae73bc4
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue May 21 08:31:10 2019 -0700

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


commit 60f60f75abd598912b495c0641a8118409ddb22a
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue May 21 08:30:26 2019 -0700

    Use USE_UNSTABLE_GEOS_CPP_API in all builds so that non-debug builds aren't noisy. Pretty silly.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44db139..fc344e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -156,7 +156,7 @@ if(GEOS_BUILD_DEVELOPER)
       $<BUILD_INTERFACE:geos_developer_cxx_flags>)
 endif()
 
-target_compile_definitions(geos_developer_cxx_flags
+target_compile_definitions(geos_cxx_flags
   INTERFACE
     USE_UNSTABLE_GEOS_CPP_API)
 
@@ -267,3 +267,39 @@ configure_file("${PROJECT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
 add_custom_target(uninstall
   "${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake/cmake_uninstall.cmake")
 
+#-----------------------------------------------------------------------------
+# Make Dist
+#-----------------------------------------------------------------------------
+
+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}")
+
+#  ".*\.yml"
+set(CPACK_SOURCE_IGNORE_FILES
+  "/\.git/"
+  "autogen.sh"
+  "HOWTO_RELEASE"
+  "autom4te.cache"
+  "/.*\.yml/"
+  "/\/debian\//"
+  "/\/php\//"
+  )
+# set(CPACK_SOURCE_IGNORE_FILES
+#   ".git"
+#   "autogen.sh"
+#   "HOWTO_RELEASE"
+#   "autom4te.cache"
+#   "debian"
+#   "php"
+#   )
+message(STATUS "GEOS: CPACK_SOURCE_IGNORE_FILES: ${CPACK_SOURCE_IGNORE_FILES}")
+include(CPack)
+add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+

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

Summary of changes:
 CMakeLists.txt | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GEOS