From bf1554b3e9f9380df298d7f2f43475facb47d8da Mon Sep 17 00:00:00 2001
From: Edward Tremel <high.order.bits@gmail.com>
Date: Tue, 17 Nov 2020 21:46:46 -0500
Subject: [PATCH] Updated CMake version in preparation for the 2.1 release

Also updated git_version.cpp manually, rather than with the commit hook,
so that the version number will already be updated in the tagged commit.
---
 CMakeLists.txt           |  4 ++--
 src/core/git_version.cpp | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a5b40db..c41a9d36 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,8 +4,8 @@ set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 project(derecho CXX)
 
 # Version
-set(derecho_VERSION 2.0)
-set(derecho_build_VERSION 2.0.1)
+set(derecho_VERSION 2.1)
+set(derecho_build_VERSION 2.1.0)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1z -fPIC")
 if (${USE_VERBS_API})
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_VERBS_API")
diff --git a/src/core/git_version.cpp b/src/core/git_version.cpp
index b607cac2..69a503d9 100644
--- a/src/core/git_version.cpp
+++ b/src/core/git_version.cpp
@@ -11,10 +11,10 @@
 namespace derecho {
 
 const int MAJOR_VERSION = 2;
-const int MINOR_VERSION = 0;
-const int PATCH_VERSION = 1;
-const int COMMITS_AHEAD_OF_VERSION = 101;
-const char* VERSION_STRING = "2.0.1";
-const char* VERSION_STRING_PLUS_COMMITS = "2.0.1+101";
+const int MINOR_VERSION = 1;
+const int PATCH_VERSION = 0;
+const int COMMITS_AHEAD_OF_VERSION = 0;
+const char* VERSION_STRING = "2.1.0";
+const char* VERSION_STRING_PLUS_COMMITS = "2.1.0+0";
 
 }