[spdlog] Update to 1.11.0 (#27771)

* [spdlog] Update to 1.11.0

* [spdlog] backporting https://github.com/gabime/spdlog/pull/2545

* [spdlog] Add 1.11.0 to versions file

* Remove patch header, add link to upstream merged PR, add quotes.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
百地 希留耶 2022-11-17 05:32:00 +08:00 committed by GitHub
parent b3bf291c9a
commit d51b969a7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 15 deletions

View File

@ -0,0 +1,13 @@
diff --git a/bench/bench.cpp b/bench/bench.cpp
index 8a46837a6..ae47f047c 100644
--- a/bench/bench.cpp
+++ b/bench/bench.cpp
@@ -15,7 +15,7 @@
#if defined(SPDLOG_USE_STD_FORMAT)
# include <format>
#elif defined(SPDLOG_FMT_EXTERNAL)
-# include <fmt/locale.h>
+# include <fmt/format.h>
#else
# include "spdlog/fmt/bundled/format.h"
#endif

View File

@ -1,9 +1,11 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO gabime/spdlog
REF v1.10.0
SHA512 e82ec0a0c813ed2f1c8a31a0f21dbb733d0a7bd8d05284feae3bd66040bc53ad47a93b26c3e389c7e5623cfdeba1854d690992c842748e072aab3e6e6ecc5666
REF v1.11.0
SHA512 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412
HEAD_REF v1.x
PATCHES
fmt-header.patch # https://github.com/gabime/spdlog/pull/2545
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@ -27,7 +29,7 @@ endif()
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SPDLOG_BUILD_SHARED)
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
-DSPDLOG_FMT_EXTERNAL=ON
@ -43,7 +45,7 @@ vcpkg_fixup_pkgconfig()
vcpkg_copy_pdbs()
# use vcpkg-provided fmt library (see also option SPDLOG_FMT_EXTERNAL above)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/bundled)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/bundled")
# add support for integration other than cmake
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h
@ -63,8 +65,7 @@ if(SPDLOG_WCHAR_FILENAMES)
)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,7 +1,6 @@
{
"name": "spdlog",
"version-semver": "1.10.0",
"port-version": 2,
"version-semver": "1.11.0",
"description": "Very fast, header only, C++ logging library",
"homepage": "https://github.com/gabime/spdlog",
"license": "MIT",

View File

@ -7093,8 +7093,8 @@
"port-version": 3
},
"spdlog": {
"baseline": "1.10.0",
"port-version": 2
"baseline": "1.11.0",
"port-version": 0
},
"spectra": {
"baseline": "1.0.1",

View File

@ -1,9 +1,9 @@
{
"versions": [
{
"git-tree": "f7ad0e9d934ce7401fb68968f5392fddc7dd4e3a",
"version-semver": "1.10.0",
"port-version": 2
"git-tree": "296d78e54c14ce64474b66f60847026ddb1f576e",
"version-semver": "1.11.0",
"port-version": 0
},
{
"git-tree": "3256ea88cc375fda2f977a2eb18435e23d498572",