Update CMake README #23
Conversation
THe readme file for cmake discusses subversion. I made the changes I think are needed for git.
|
I would suggestion using a git tag to mark the release commit. It's human readable at least and can be used to That said, using the hash also works fine. |
| @@ -179,7 +179,7 @@ Set GMT_RELEASE_PREFIX in cmake/ConfigUser.cmake and run cmake. Then do | |||
| You should then edit ${GMT_RELEASE_PREFIX}/cmake/ConfigDefault.cmake and | |||
| set GMT_PACKAGE_VERSION_MAJOR, GMT_PACKAGE_VERSION_MINOR, and | |||
| GMT_PACKAGE_VERSION_PATCH. Also uncomment and set | |||
| GMT_SOURCE_CODE_CONTROL_VERSION_STRING to the current svn version. Then | |||
| GMT_SOURCE_CODE_CONTROL_VERSION_STRING to the current git version. Then | |||
There was a problem hiding this comment.
But what would contain the GMT_SOURCE_CODE_CONTROL_VERSION_STRING? With SVN it was the revision number but in git we have only hash numbers.
There was a problem hiding this comment.
That is OK I think. A release will say 6.0.0 but until then it says
pwessel@MacBeth:~-> gmt --version
6.0.0_r49baf49
There was a problem hiding this comment.
Right, but when it's defined (gmt_version.h.in) it falls to @GMT_PACKAGE_VERSION_WITH_SVN_REVISION@
#ifdef GMT_SOURCE_CODE_CONTROL_VERSION_STRING
# define GMT_STRING "@GMT_PACKAGE_VERSION_WITH_SVN_REVISION@ (r@GMT_SOURCE_CODE_CONTROL_VERSION_STRING@)"
There was a problem hiding this comment.
Yes, we need to make some edits there as well.
|
It would be good to drop the leading |
makes no sense to have a prepended r to the git hash string
|
I tried to compile the master branch. It still gives a version string with a letter 'r'. 63665d7 is the hash of the latest commit. |
The readme file for cmake discusses subversion. I made the changes I think are needed for git.
The only question has to do with the GMT_SOURCE_CODE_CONTROL_VERSION_STRING since svn uses integers and git the hash?