Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated fmt to version 9.1.0 #679

Merged
merged 2 commits into from
Aug 29, 2022
Merged

Updated fmt to version 9.1.0 #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7c30dc
Fixed build against fmt 9.0.0.
xvitaly Jul 16, 2022
148d2f0
Updated bundled fmt to version 9.1.0.
xvitaly Jul 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions cmake/Findfmt.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
option(VCPKG_DEPENDENCY_EXTERNAL_FMT "Use an external version of the fmt library" OFF)
set(VCPKG_FMT_URL "https://github.com/fmtlib/fmt/archive/refs/tags/8.1.1.tar.gz" CACHE STRING "URL to the fmt release tarball to use.")

set(VCPKG_FMT_VERSION "9.1.0" CACHE STRING "Required fmt release version.")
set(VCPKG_FMT_HASH "a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be" CACHE STRING "SHA512 hash of the fmt release tarball.")
set(VCPKG_FMT_URL "https://github.com/fmtlib/fmt/archive/refs/tags/${VCPKG_FMT_VERSION}.tar.gz" CACHE STRING "URL to the fmt release tarball to use.")

include(FetchContent)
FetchContent_Declare(
fmt
URL "${VCPKG_FMT_URL}"
URL_HASH SHA512=794a47d7cb352a2a9f2c050a60a46b002e4157e5ad23e15a5afc668e852b1e1847aeee3cda79e266c789ff79310d792060c94976ceef6352e322d60b94e23189
URL_HASH "SHA512=${VCPKG_FMT_HASH}"
)

if(NOT fmt_FIND_REQUIRED)
message(FATAL_ERROR "fmt must be REQUIRED")
endif()

if(VCPKG_DEPENDENCY_EXTERNAL_FMT)
find_package(fmt CONFIG REQUIRED)
find_package(fmt ${VCPKG_FMT_VERSION} CONFIG REQUIRED)
else()
FetchContent_MakeAvailable(fmt)
endif()
2 changes: 1 addition & 1 deletion include/vcpkg/base/fwd/format.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace fmt
{
inline namespace v8
inline namespace v9
{
template<typename T, typename Char, typename Enable>
struct formatter;
Expand Down