From 6be4c2d1085246c818d77e3ae24fa5c4ef64eb80 Mon Sep 17 00:00:00 2001 From: Lin Huang Date: Thu, 5 Oct 2023 16:48:09 -0400 Subject: [PATCH 1/2] create release/5.0 branch and bump Leap version to 5.0.0 rc1 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dbd70a1a1d..3ac5693df9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,10 +13,10 @@ set( CMAKE_CXX_STANDARD 20 ) set( CMAKE_CXX_EXTENSIONS ON ) set( CXX_STANDARD_REQUIRED ON) -set(VERSION_MAJOR 4) -set(VERSION_MINOR 1) +set(VERSION_MAJOR 5) +set(VERSION_MINOR 0) set(VERSION_PATCH 0) -set(VERSION_SUFFIX dev) +set(VERSION_SUFFIX rc1) if(VERSION_SUFFIX) set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}") From dfdd0911cbadc0ec364994dcba18934c1a6fa3a3 Mon Sep 17 00:00:00 2001 From: Lin Huang Date: Thu, 5 Oct 2023 22:01:48 -0400 Subject: [PATCH 2/2] merge 5.0.0-rc-1 and correct Leap version --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ac5693df9..29cc78775f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,9 +14,9 @@ set( CMAKE_CXX_EXTENSIONS ON ) set( CXX_STANDARD_REQUIRED ON) set(VERSION_MAJOR 5) -set(VERSION_MINOR 0) +set(VERSION_MINOR 1) set(VERSION_PATCH 0) -set(VERSION_SUFFIX rc1) +set(VERSION_SUFFIX dev) if(VERSION_SUFFIX) set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")