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

Jump to bottom

Update CMake README #23

Merged
merged 2 commits into from
Aug 21, 2018
Merged

Update CMake README #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b727ce0
Update CMake README
PaulWessel Aug 17, 2018
8b2ec95
Remove the svn "r"
PaulWessel Aug 21, 2018
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
14 changes: 7 additions & 7 deletions README.CMake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ Information for building GMT with CMake
Quick start:
~~~~~~~~~~~~

Checkout GMT5 from its subversion repository:
Checkout GMT5 from its GitHub repository:

$ svn co svn:https://gmtserver.soest.hawaii.edu/gmt/trunk gmt-dev
$ cd gmt-dev
$ git clone https:https://github.com/GenericMappingTools/gmt
$ cd gmt
$ cp cmake/ConfigUserTemplate.cmake cmake/ConfigUser.cmake

Edit *cmake/ConfigUser.cmake* [see comments in the file]. Then:
Expand Down Expand Up @@ -70,8 +70,8 @@ There are two configuration files:

1. "ConfigDefault.cmake" -- is version controlled and used to add new default
variables and set defaults for everyone. You should not edit this file.
2. "ConfigUser.cmake" -- is not version controlled (currently listed in
svn:ignore property) and used to override defaults on a per-user basis.
2. "ConfigUser.cmake" -- is not version controlled and used to override defaults
on a per-user basis.
There is a template file, ConfigUserTemplate.cmake, that you should copy
to ConfigUser.cmake and make your changes therein.

Expand Down Expand Up @@ -149,7 +149,7 @@ Assuming you did not delete the build directory and that your current
working directory is the build directory this is just as simple as

$ cd ..
$ svn up
$ git pull
$ cd -
$ make -jx install

Expand Down Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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@)"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we need to make some edits there as well.

create tarballs with:

$ make -jx gmt_release_tar
Expand Down
2 changes: 1 addition & 1 deletion src/gmt_version.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#cmakedefine GMT_SOURCE_CODE_CONTROL_VERSION_STRING "@GMT_SOURCE_CODE_CONTROL_VERSION_STRING@"
#ifdef GMT_SOURCE_CODE_CONTROL_VERSION_STRING
# define GMT_STRING "@GMT_PACKAGE_VERSION_WITH_SVN_REVISION@ (r@GMT_SOURCE_CODE_CONTROL_VERSION_STRING@)"
# define GMT_STRING "@GMT_PACKAGE_VERSION_WITH_SVN_REVISION@ (@GMT_SOURCE_CODE_CONTROL_VERSION_STRING@)"
#else /* if HAVE_SVN_VERSION or if unversioned */
# define GMT_STRING "@GMT_PACKAGE_VERSION_WITH_SVN_REVISION@"
#endif
Expand Down