Skip to content

Commit

Permalink
Update CMake README (#23)
Browse files Browse the repository at this point in the history
* Update CMake README

THe readme file for cmake discusses subversion.  I made the changes I think are needed for git.

* Remove the svn "r"

makes no sense to have a prepended r to the git hash string
  • Loading branch information
PaulWessel committed Aug 21, 2018
1 parent e805171 commit 6136b6a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions README.CMake
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
create tarballs with:

$ make -jx gmt_release_tar
Expand Down
2 changes: 1 addition & 1 deletion src/gmt_version.h.in
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

0 comments on commit 6136b6a

Please sign in to comment.