From 13508bb6b4efccd5525e2f865688ab08c2fd8b6c Mon Sep 17 00:00:00 2001 From: Edward Tremel Date: Thu, 2 May 2024 12:32:46 -0400 Subject: [PATCH 1/2] Minor CMakeLists fixes Removed the unused "ignoreMe" variable in the root CMakeLists, which didn't do anything, and added a version range to our cmake_minimum_required to indicate we've tested it on versions up to 3.22 (the version on the Fractus nodes). --- CMakeLists.txt | 4 +--- src/applications/CMakeLists.txt | 2 +- src/applications/demos/CMakeLists.txt | 2 +- src/applications/tests/CMakeLists.txt | 4 ++-- src/core/git_version.cpp | 4 ++-- src/mutils-serialization/CMakeLists.txt | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b80fb628..a3b2a83d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15.4) +cmake_minimum_required(VERSION 3.15.4...3.22) set(CMAKE_DISABLE_SOURCE_CHANGES ON) set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) project(derecho CXX) @@ -16,8 +16,6 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall") set(CMAKE_CXX_FLAGS_BENCHMARK "${CMAKE_CXX_FLAGS_RELEASE} -Wall -DNOLOG -Ofast -march=native") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Wall -ggdb -gdwarf-3") -set(ignoreMe "${CMAKE_WARN_DEPRECATED}") - set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules") include(GNUInstallDirs) diff --git a/src/applications/CMakeLists.txt b/src/applications/CMakeLists.txt index c9ae0c8b..1f92f299 100644 --- a/src/applications/CMakeLists.txt +++ b/src/applications/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15.4) +cmake_minimum_required(VERSION 3.15.4...3.22) set(CMAKE_DISABLE_SOURCE_CHANGES ON) set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) diff --git a/src/applications/demos/CMakeLists.txt b/src/applications/demos/CMakeLists.txt index 4f951147..7455396c 100644 --- a/src/applications/demos/CMakeLists.txt +++ b/src/applications/demos/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15.4) +cmake_minimum_required(VERSION 3.15.4...3.22) set(CMAKE_DISABLE_SOURCE_CHANGES ON) set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) include(CheckLanguage) diff --git a/src/applications/tests/CMakeLists.txt b/src/applications/tests/CMakeLists.txt index e9264ffc..0a634e7f 100644 --- a/src/applications/tests/CMakeLists.txt +++ b/src/applications/tests/CMakeLists.txt @@ -1,6 +1,6 @@ -cmake_minimum_required(VERSION 3.15.4) +cmake_minimum_required(VERSION 3.15.4...3.22) set(CMAKE_DISABLE_SOURCE_CHANGES ON) set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) add_subdirectory(unit_tests) -add_subdirectory(performance_tests) \ No newline at end of file +add_subdirectory(performance_tests) diff --git a/src/core/git_version.cpp b/src/core/git_version.cpp index b9ff2925..dde12f0a 100644 --- a/src/core/git_version.cpp +++ b/src/core/git_version.cpp @@ -13,8 +13,8 @@ namespace derecho { const int MAJOR_VERSION = 2; const int MINOR_VERSION = 3; const int PATCH_VERSION = 0; -const int COMMITS_AHEAD_OF_VERSION = 229; +const int COMMITS_AHEAD_OF_VERSION = 231; const char* VERSION_STRING = "2.3.0"; -const char* VERSION_STRING_PLUS_COMMITS = "2.3.0+229"; +const char* VERSION_STRING_PLUS_COMMITS = "2.3.0+231"; } diff --git a/src/mutils-serialization/CMakeLists.txt b/src/mutils-serialization/CMakeLists.txt index fe10b4d5..e315c4a7 100644 --- a/src/mutils-serialization/CMakeLists.txt +++ b/src/mutils-serialization/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.1) +cmake_minimum_required (VERSION 3.15.4...3.22) set(CMAKE_DISABLE_SOURCE_CHANGES ON) set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) project (mutils-serialization) From ff98765a2ef5d3eaf4864a822ca27c3b253c18ee Mon Sep 17 00:00:00 2001 From: Edward Tremel Date: Thu, 2 May 2024 12:50:24 -0400 Subject: [PATCH 2/2] Updated version number to 2.4.0 I'm about to create the 2.4.0 release, and this commit needs to exist first so it can be tagged for the release. --- CMakeLists.txt | 4 ++-- src/core/git_version.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a3b2a83d..c4654052 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.3) -set(derecho_build_VERSION 2.3.0) +set(derecho_VERSION 2.4) +set(derecho_build_VERSION 2.4.0) set(CMAKE_CXX_STANDARD 17) set(CMAKE_POSITION_INDEPENDENT_CODE ON) if (${USE_VERBS_API}) diff --git a/src/core/git_version.cpp b/src/core/git_version.cpp index dde12f0a..91c029e9 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 = 3; +const int MINOR_VERSION = 4; const int PATCH_VERSION = 0; -const int COMMITS_AHEAD_OF_VERSION = 231; -const char* VERSION_STRING = "2.3.0"; -const char* VERSION_STRING_PLUS_COMMITS = "2.3.0+231"; +const int COMMITS_AHEAD_OF_VERSION = 0; +const char* VERSION_STRING = "2.4.0"; +const char* VERSION_STRING_PLUS_COMMITS = "2.3.0+0"; }