Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set an empty GDAL_RELEASE_NICKNAME by default #11899

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −3
Open

Set an empty GDAL_RELEASE_NICKNAME by default #11899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gcore/gdal_misc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2837,7 +2837,7 @@ int CPL_STDCALL GDALWriteWorldFile(const char *pszBaseFilename,
* string. i.e. "20230312".</li>
* <li> "RELEASE_NAME": Returns the GDAL_RELEASE_NAME. ie. "3.6.3"</li>
* <li> "RELEASE_NICKNAME": (>= 3.11) Returns the GDAL_RELEASE_NICKNAME.
* i.e. "Trans rights are human rights"</li>
* (may be empty)</li>
* <li> "--version": Returns one line version message suitable for
* use in response to --version requests. i.e. "GDAL 3.6.3, released
* 2023/03/12"</li>
Expand Down Expand Up @@ -3002,7 +3002,7 @@ const char *CPL_STDCALL GDALVersionInfo(const char *pszRequest)
else if (EQUAL(pszRequest, "RELEASE_NAME"))
osVersionInfo.Printf(GDAL_RELEASE_NAME);
else if (EQUAL(pszRequest, "RELEASE_NICKNAME"))
osVersionInfo.Printf(GDAL_RELEASE_NICKNAME);
osVersionInfo.Printf("%s", GDAL_RELEASE_NICKNAME);
else // --version
{
osVersionInfo.Printf(
Expand Down
4 changes: 3 additions & 1 deletion gcore/gdal_version.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
# define GDAL_RELEASE_NAME "3.11.0dev"
#endif

#define GDAL_RELEASE_NICKNAME "Trans rights are human rights"
#ifndef GDAL_RELEASE_NICKNAME
#define GDAL_RELEASE_NICKNAME ""
#endif

#endif
Loading