Skip to content

Commit

Permalink
Updated CMake version in preparation for the 2.1 release
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
etremel committed Nov 18, 2020
1 parent 9309e41 commit bf1554b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Expand Up @@ -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")
Expand Down
10 changes: 5 additions & 5 deletions src/core/git_version.cpp
Expand Up @@ -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";

}

0 comments on commit bf1554b

Please sign in to comment.