Skip to content

Commit

Permalink
Updated CMakeLists in preparation for the 2.2 release
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
etremel committed Jul 20, 2021
1 parent a5d346b commit 03edaf8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/core/git_version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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";

}

0 comments on commit 03edaf8

Please sign in to comment.