From 03edaf81652b11beef6c33262ee5ae6a61881e45 Mon Sep 17 00:00:00 2001
From: Edward Tremel <high.order.bits@gmail.com>
Date: Tue, 20 Jul 2021 13:12:07 -0400
Subject: [PATCH] Updated CMakeLists in preparation for the 2.2 release

I also noticed that CMakeLists still didn't require LibFabric 1.12 even
though we updated our dependency to that version, so I fixed it.
---
 CMakeLists.txt           | 6 +++---
 src/core/git_version.cpp | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0e7dfa2..0adecc7b 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.1)
-set(derecho_build_VERSION 2.1.0)
+set(derecho_VERSION 2.2)
+set(derecho_build_VERSION 2.2.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")
@@ -50,7 +50,7 @@ endif()
 # libfabric_FOUND
 # libfabric_INCLUDE_DIRS
 # libfabric_LIBRARIES
-find_package(libfabric 1.7.0 REQUIRED)
+find_package(libfabric 1.12.1 REQUIRED)
 
 # spdlog is a packaged system library, so this probably isn't necessary, but
 # it helps ensure that the right version is installed
diff --git a/src/core/git_version.cpp b/src/core/git_version.cpp
index f9ca5798..fca58a22 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 = 1;
+const int MINOR_VERSION = 2;
 const int PATCH_VERSION = 0;
-const int COMMITS_AHEAD_OF_VERSION = 138;
-const char* VERSION_STRING = "2.1.0";
-const char* VERSION_STRING_PLUS_COMMITS = "2.1.0+138";
+const int COMMITS_AHEAD_OF_VERSION = 0;
+const char* VERSION_STRING = "2.2.0";
+const char* VERSION_STRING_PLUS_COMMITS = "2.2.0+0";
 
 }