Skip to content

Commit

Permalink
Closes libgeos#921 Added new way to change version for cmake build
Browse files Browse the repository at this point in the history
  • Loading branch information
cvvergara committed Aug 25, 2018
1 parent a39e412 commit 16bd141
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
10 changes: 6 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions HOWTO_RELEASE
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 16bd141

Please sign in to comment.