[geos-commits] [SCM] GEOS branch master updated. cb40f9596a9615e39df4dcaece3e1b4693180c1a

[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  cb40f9596a9615e39df4dcaece3e1b4693180c1a (commit)
       via  16bd141c8f9cd05f12f1d0574c4ffc89703e48d2 (commit)
      from  a39e412e43f8b48fd873169d9d3af2b23071126e (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 cb40f9596a9615e39df4dcaece3e1b4693180c1a
Merge: a39e412 16bd141
Author: cvvergara <vicky at georepublic.de>
Date:   Sun Aug 26 19:16:48 2018 -0700

    Merge branch 'fix-cmake-version' of cvvergara/geos into master


commit 16bd141c8f9cd05f12f1d0574c4ffc89703e48d2
Author: cvvergara <vicky at georepublic.de>
Date:   Sun Aug 26 00:58:18 2018 +0200

    Closes #921 Added new way to change version for cmake build

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b1f47b..3dad493 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,8 @@ endif()
 # Set GEOS project
 #################################################################################
 project(GEOS VERSION 3.8.0 LANGUAGES C CXX)
+# OPTIONS: "", "dev", "rc1" etc.
+SET(GEOS_PATCH_WORD "dev")
 
 # Add custom GEOS modules for CMake
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules")
@@ -43,14 +45,14 @@ message(STATUS "Setting C++ requirement to C++${CMAKE_CXX_STANDARD}")
 
 # GEOS release version
 # GEOS C++ library SONAME will use these encoding ABI break at every release
-set(GEOS_VERSION "${GEOS_VERSION_MAJOR}.${GEOS_VERSION_MINOR}.${GEOS_VERSION_PATCH}")
+set(GEOS_VERSION "${GEOS_VERSION_MAJOR}.${GEOS_VERSION_MINOR}.${GEOS_VERSION_PATCH}${GEOS_PATCH_WORD}")
 set(VERSION "${GEOS_VERSION}")
 
 # Copy version components into different variable names to match those used
 # by autotools for *.h.in files
-set(VERSION_MAJOR ${GEOS_VERSION_MAJOR})
-set(VERSION_MINOR ${GEOS_VERSION_MINOR})
-set(VERSION_PATCH ${GEOS_VERSION_PATCH}dev)
+set(VERSION_MAJOR "${GEOS_VERSION_MAJOR}")
+set(VERSION_MINOR "${GEOS_VERSION_MINOR}")
+set(VERSION_PATCH "${GEOS_VERSION_PATCH}${GEOS_PATCH_WORD}")
 
 # JTS_PORT is the version of JTS this release is bound to
 set(JTS_PORT 1.13.0)
diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index e5c7a4b..eaf4f7b 100644
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -36,9 +36,9 @@
       - VERSION_MAJOR for SUBSTANTIAL additions or C lib ABI break
         [ THIS MUST BE CAREFULLY AVOIDED ]
     - In main CMakeLists.txt main one
-       - CHANGE the line: project(GEOS VERSION <mayor>.<minor>.<micro> LANGUAGES C CXX)
-       - CHANGE the line: set(GEOS_VERSION_PATCH "${GEOS_VERSION_PATCH}dev")
-       - CAPI_INTERFACE_*
+       - On section: "# Set GEOS project"
+         - CHANGE the line: project(GEOS VERSION <mayor>.<minor>.<micro> LANGUAGES C CXX)
+         - CHANGE the line: SET(GEOS_PATCH_WORD "dev")
 
 12. Update wiki page https://trac.osgeo.org/geos/ at Download section
     - Add latest release

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

Summary of changes:
 CMakeLists.txt | 10 ++++++----
 HOWTO_RELEASE  |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GEOS