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

[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  ab3026ef1d839231a697e01278791550fd2d751b (commit)
      from  2a2d2f304913ed153ee884bf095bfb41446e1f62 (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 ab3026ef1d839231a697e01278791550fd2d751b
Author: Mike Taves <mwtoews at gmail.com>
Date:   Wed Dec 2 15:45:53 2020 +1300

    CMake: re-write GEOS_VERSION and GEOS_VERSION_PATCH after project()
    
    This is only done if GEOS_PATCH_WORD is used. Remove GEOS_VERSION_FULL.
    
    Closes #1082

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a9c32f..b9e2e32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,10 +125,10 @@ project(GEOS VERSION "${_version_major}.${_version_minor}.${_version_patch}"
   LANGUAGES C CXX
   ${_project_info})
 
-if("${_version_patch_word}" STREQUAL "")
-  set(GEOS_VERSION_FULL "${GEOS_VERSION}")
-else()
-  set(GEOS_VERSION_FULL "${GEOS_VERSION}${_version_patch_word}")
+if(NOT "${_version_patch_word}" STREQUAL "")
+  # Re-write VERSION variables after project()
+  set(GEOS_VERSION "${GEOS_VERSION}${_version_patch_word}")
+  set(GEOS_VERSION_PATCH "${_version_patch}${_version_patch_word}")
 endif()
 
 unset(_version_major)
@@ -136,7 +136,7 @@ unset(_version_minor)
 unset(_version_patch)
 unset(_version_patch_word)
 
-message(STATUS "GEOS: Version ${GEOS_VERSION_FULL}")
+message(STATUS "GEOS: Version ${GEOS_VERSION}")
 message(STATUS "GEOS: C API Version ${CAPI_VERSION}")
 message(STATUS "GEOS: JTS port ${JTS_PORT}")
 
@@ -348,7 +348,7 @@ if(NOT _is_multi_config_generator)
   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_PACKAGE_FILE_NAME "geos-${GEOS_VERSION}")
 
   set(CPACK_SOURCE_IGNORE_FILES
     "/\\\\.git"
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 77c93ed..b7e6d33 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -29,7 +29,7 @@ if(BUILD_DOCUMENTATION)
     endif()
 
     set(srcdir ${CMAKE_CURRENT_SOURCE_DIR})
-    set(VERSION ${GEOS_VERSION_FULL})
+    set(VERSION ${GEOS_VERSION})
     set(DOXYGEN_LOGFILE ${CMAKE_CURRENT_BINARY_DIR}/doxygen.log)
     set(CHECK_ERROR_SCRIPT "check_doxygen_errors.cmake")
     configure_file(

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

Summary of changes:
 CMakeLists.txt     | 12 ++++++------
 doc/CMakeLists.txt |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GEOS