Skip to content

[fmt] Update to 7.0.2 + [spdlog] Update to 1.7.0 #12312

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

Merged
strega-nil merged 9 commits into from
Aug 7, 2020
+18 −19
Merged

[fmt] Update to 7.0.2 + [spdlog] Update to 1.7.0 #12312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9a2f369
[fmt] Update to 7.0.0
kevinlul Jul 7, 2020
e746be3
[fmt] Update to 7.0.1
kevinlul Jul 7, 2020
e581999
[spdlog] Update to 1.7.0
kevinlul Jul 11, 2020
aec0695
[quill] Patch for fmt 7.x
kevinlul Jul 17, 2020
97dcc3c
[fmt] Update to 7.0.2
kevinlul Jul 30, 2020
73dceb3
[quill] Update baseline
kevinlul Jul 31, 2020
67b9e6c
[fmt] Use vcpkg_replace_string
kevinlul Jul 31, 2020
bd4a998
Merge remote-tracking branch 'upstream/master' into fmt-7.0.0
strega-nil Aug 5, 2020
288cf69
remove unnecessary change to `SOURCE_PATH`
strega-nil Aug 5, 2020
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
2 changes: 1 addition & 1 deletion ports/fmt/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: fmt
Version: 6.2.1
Version: 7.0.2
Homepage: https://github.com/fmtlib/fmt
Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.
26 changes: 14 additions & 12 deletions ports/fmt/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO fmtlib/fmt
REF 19bd751020a1f3c3363b2eb67a039852f139a8d3#version 6.2.1
SHA512 5d03445c64c3b7973bdf4e445238c63fa41bf0fa8c2d5b32cd56f0a6b3036b039d9c303a06300f3af87795a07f80f2ed28b90ddbf9c3f7398796d77906c21f40
REF b9d749095e3397f154e2938f96dd11912f2d9300#version 7.0.2
SHA512 5e81369ba97fb9e7fbaeed87b23fc7f1db1459d5c67eba1d92a697840fa004097d714127381aa2aa1437f5730b27e38a71e3ddf6a4a73c8d5eeaa32b3efb3d80
HEAD_REF master
PATCHES fix-warning4189.patch
)
Expand Down Expand Up @@ -33,10 +33,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
endif()
endif()

# Force FMT_SHARED to 1
file(READ ${CURRENT_PACKAGES_DIR}/include/fmt/core.h FMT_CORE_H)
string(REPLACE "defined(FMT_SHARED)" "1" FMT_CORE_H "${FMT_CORE_H}")
file(WRITE ${CURRENT_PACKAGES_DIR}/include/fmt/core.h "${FMT_CORE_H}")
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fmt/core.h
"defined(FMT_SHARED)"
"1"
)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

Expand All @@ -45,14 +45,16 @@ vcpkg_fixup_pkgconfig()

if(VCPKG_TARGET_IS_WINDOWS)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake FMT_DEBUG_MODULE)
string(REPLACE "lib/fmtd.dll" "bin/fmtd.dll" FMT_DEBUG_MODULE ${FMT_DEBUG_MODULE})
file(WRITE ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake "${FMT_DEBUG_MODULE}")
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake
"lib/fmtd.dll"
"bin/fmtd.dll"
)
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake FMT_RELEASE_MODULE)
string(REPLACE "lib/fmt.dll" "bin/fmt.dll" FMT_RELEASE_MODULE ${FMT_RELEASE_MODULE})
file(WRITE ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake "${FMT_RELEASE_MODULE}")
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake
"lib/fmt.dll"
"bin/fmt.dll"
)
endif()
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
Expand Down
2 changes: 1 addition & 1 deletion ports/spdlog/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: spdlog
Version: 1.6.1
Version: 1.7.0
Homepage: https://github.com/gabime/spdlog
Description: Very fast, header only, C++ logging library
Build-Depends: fmt
Expand Down
4 changes: 2 additions & 2 deletions ports/spdlog/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO gabime/spdlog
REF 22a169bc319ac06948e7ee0be6b9b0ac81386604 #v1.6.1
SHA512 29eac6f1be8d9fc08a257eab7f59cf70d63b2978fa4b8b63c825b39cf77f2505083bfd9db3fa2925739cea71d07986c022fc3d236cce351b3570d543f100a8a5
REF 616caa5d30172b65cc3a06800894c575d70cb8e6 #v1.7.0
SHA512 47411e8a607a339bffe2d5e13b4568b825ee8a07d88e69cf32096b08b76cdb60cbd64003620506e9c5748d3f66d8df76fa8880bb1a092923b7b405fedd18ad0c
HEAD_REF v1.x
)

Expand Down
3 changes: 0 additions & 3 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1467,9 +1467,6 @@ quickfix:x64-uwp=fail
quickfix:x64-windows-static=fail
quickfix:x64-windows=fail
quickfix:x86-windows=fail
quill:arm64-windows=fail
quill:arm-uwp=fail
quill:x64-uwp=fail
quirc:arm64-windows = skip
quirc:arm-uwp = skip
quirc:x64-linux = skip
Expand Down