[geos-commits] [SCM] GEOS branch main updated. 69335b86051b8e27c981e18de4762a97764b512a
git at osgeo.org
git at osgeo.org
Fri Oct 1 10:21:43 PDT 2021
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, main has been updated
via 69335b86051b8e27c981e18de4762a97764b512a (commit)
from 56b5d56d6948f91b5ddb253b04becbd072b2fcbc (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 69335b86051b8e27c981e18de4762a97764b512a
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Fri Oct 1 10:21:39 2021 -0700
do not use CMAKE_PROJECT_VERSION for clean version string
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2e9c26..897e34c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,6 +131,7 @@ if(NOT "${_version_patch_word}" STREQUAL "")
set(GEOS_VERSION "${GEOS_VERSION}${_version_patch_word}")
set(GEOS_VERSION_PATCH "${_version_patch}${_version_patch_word}")
endif()
+set(GEOS_VERSION_NOPATCH "${_version_major}.${_version_minor}.${_version_patch}")
unset(_version_major)
unset(_version_minor)
@@ -271,8 +272,8 @@ if(BUILD_SHARED_LIBS)
target_compile_definitions(geos
PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,GEOS_DLL_EXPORT,DLL_EXPORT>)
- set_target_properties(geos PROPERTIES VERSION ${CMAKE_PROJECT_VERSION})
- set_target_properties(geos PROPERTIES SOVERSION ${CMAKE_PROJECT_VERSION})
+ set_target_properties(geos PROPERTIES VERSION ${GEOS_VERSION_NOPATCH})
+ set_target_properties(geos PROPERTIES SOVERSION ${GEOS_VERSION_NOPATCH})
endif()
#-----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list