diff --git a/CMake/PISM_CMake_macros.cmake b/CMake/PISM_CMake_macros.cmake index e7669a46b0..47b2a0bc25 100644 --- a/CMake/PISM_CMake_macros.cmake +++ b/CMake/PISM_CMake_macros.cmake @@ -74,7 +74,7 @@ macro(pism_set_revision_tag) # Otherwise... if (NOT Pism_VERSION) - set (Pism_VERSION "no-version-control") + set (Pism_VERSION "v1.2.1") endif (NOT Pism_VERSION) set (Pism_REVISION_TAG "${Pism_BRANCH} ${Pism_VERSION}") diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py index 53f97cb41c..6677a69ce7 100644 --- a/doc/sphinx/conf.py +++ b/doc/sphinx/conf.py @@ -77,9 +77,9 @@ def git(command): # built documents. # # The short X.Y version. -version = '1.2' +version = '1.2.1' # The full version, including alpha/beta/rc tags. -release = '1.2' +release = '1.2.1' # The language for content autogenerated by Sphinx. language = None