Skip to content

[Backport release/3.13] ogrgeometry: do not redefine SFCGAL VERSION macros if they already exist#14673

Merged
rouault merged 2 commits into
release/3.13from
backport-14667-to-release/3.13
May 27, 2026
Merged

[Backport release/3.13] ogrgeometry: do not redefine SFCGAL VERSION macros if they already exist#14673
rouault merged 2 commits into
release/3.13from
backport-14667-to-release/3.13

Conversation

@rouault
Copy link
Copy Markdown
Member

@rouault rouault commented May 27, 2026

Backport #14667
Authored by: @ptitjano

ptitjano added 2 commits May 27, 2026 19:16
SFCGAL already defines SFCGAL_VERSION macro to define SFCGAL version
as a string (for example "2.3.0"). Rename SFCGAL_VERSION to
SFCGAL_VERSION_NUM to avoid name collision.
`SFCGAL_MAKE_VERSION` and `SFCGAL_VERSION_NUM` have been available
since SFCGAL 2.3.

See: https://gitlab.com/sfcgal/SFCGAL/-/merge_requests/654
@rouault rouault added this to the 3.13.1 milestone May 27, 2026
@rouault rouault merged commit 3eff34a into release/3.13 May 27, 2026
27 of 37 checks passed
@rouault rouault deleted the backport-14667-to-release/3.13 branch May 27, 2026 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants