From 5ec55c23ab2ad8dc0177eeafc4385598d9e2501c Mon Sep 17 00:00:00 2001 From: ClausKlein Date: Thu, 26 Dec 2024 18:46:52 +0100 Subject: [PATCH] Update to fmt v11.1.0 --- CMakeLists.txt | 6 +++--- CMakePresets.json | 2 +- module/tests/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 2 +- tests/header-only-test.cc | 8 ++------ 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a3d57c..e1c46fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.25...3.31) include(cmake/prelude.cmake) project(fmt - VERSION 11.0.2.1 + VERSION 11.1.0.1 DESCRIPTION "A modern formatting library" HOMEPAGE_URL https://fmt.dev/11.0/ LANGUAGES CXX @@ -52,8 +52,8 @@ include(cmake/CPM.cmake) cpmaddpackage( NAME fmt GITHUB_REPOSITORY fmtlib/fmt - GIT_TAG 11.0.2 - VERSION 11.0.2 + GIT_TAG 11.1.0 + VERSION 11.1.0 DOWNLOAD_ONLY YES ) # cmake-format: on diff --git a/CMakePresets.json b/CMakePresets.json index a3e4bce..bd72306 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -76,7 +76,7 @@ "hidden": true, "cacheVariables": { "CMAKE_CXX_FLAGS": - "-fstack-protector-strong -Wall -Wextra -Wpedantic -Wno-conversion -Wno-sign-conversion -Wcast-qual -Wformat=2 -Wundef -Werror=float-equal -Wshadow -Wcast-align -Wunused -Wnull-dereference -Wdouble-promotion -Wno-implicit-fallthrough -Wextra-semi -Woverloaded-virtual -Wnon-virtual-dtor -Wno-old-style-cast" + "-fstack-protector-strong -Wall -Wextra -Wpedantic -Wno-conversion -Wno-sign-conversion -Wcast-qual -Wformat=2 -Wundef -Wfloat-equal -Wshadow -Wcast-align -Wunused -Wnull-dereference -Wdouble-promotion -Wno-implicit-fallthrough -Wextra-semi -Woverloaded-virtual -Wnon-virtual-dtor -Wno-old-style-cast" }, "condition": { "type": "equals", diff --git a/module/tests/CMakeLists.txt b/module/tests/CMakeLists.txt index 9d4df67..34c027c 100644 --- a/module/tests/CMakeLists.txt +++ b/module/tests/CMakeLists.txt @@ -6,7 +6,7 @@ if(PROJECT_IS_TOP_LEVEL) enable_testing() # Find the fmt package containing the function to build the module - find_package(fmt 11.0.2.1 EXACT REQUIRED HINT ../../stagedir/lib) + find_package(fmt 11.1.0.1 EXACT REQUIRED HINT ../../stagedir/lib) # Use modules? unset(USE_MODULES) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b01e1e3..22b871c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -10,7 +10,7 @@ include(../cmake/windows-set-path.cmake OPTIONAL) if(PROJECT_IS_TOP_LEVEL) enable_testing() - find_package(fmt 11.0.2.1 EXACT REQUIRED) + find_package(fmt 11.1.0.1 EXACT REQUIRED) include(../cmake/CPM.cmake) endif() diff --git a/tests/header-only-test.cc b/tests/header-only-test.cc index a567f3f..7fac126 100644 --- a/tests/header-only-test.cc +++ b/tests/header-only-test.cc @@ -1,20 +1,16 @@ // Header-only configuration test +#include + #ifdef FMT_MODULE import fmt; #else # include "fmt/base.h" # include "fmt/ostream.h" -# include #endif - auto main() -> int { -#ifdef FMT_MODULE - fmt::print("OK"); -#else constexpr std::string_view text{"constexpr"}; fmt::print(text); -#endif }