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

[fmt] update to 8.0.1 #18581

Merged
merged 14 commits into from
Sep 7, 2021
Merged

[fmt] update to 8.0.1 #18581

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9d07c3a
[fmt] update to 8.0.0
JonLiu1993 Jun 22, 2021
a944798
update version
JonLiu1993 Jun 22, 2021
09fd9f8
revert patch foramt
JonLiu1993 Jun 25, 2021
0b52258
update version
JonLiu1993 Jun 25, 2021
6c10d94
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
JonLiu1993 Jun 25, 2021
458883a
fix conflicts files
JonLiu1993 Jul 8, 2021
c1e984c
update version
JonLiu1993 Jul 8, 2021
fc60160
[fmt] update to 8.0.0
JonLiu1993 Jul 30, 2021
447867b
update version
JonLiu1993 Jul 30, 2021
87a043e
[fmt] update to 8.0.1
JonLiu1993 Jul 30, 2021
6e098d3
update version
JonLiu1993 Jul 30, 2021
e217a69
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
JonLiu1993 Sep 6, 2021
e79b492
Apply suggested change
JonLiu1993 Sep 6, 2021
0bad353
update version
JonLiu1993 Sep 6, 2021
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
14 changes: 0 additions & 14 deletions ports/fmt/fix-warning4189.patch
View file
Open in desktop

This file was deleted.

17 changes: 8 additions & 9 deletions ports/fmt/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO fmtlib/fmt
REF 7bdf0628b1276379886c7f6dda2cef2b3b374f0b # v7.1.3
SHA512 52ea8f9d2c0cb52ec3a740e38fcdfd6a0318566e3b599bd2e8d557168642d005c0a59bc213cff2641a88fed3bb771d15f46c39035ccd64809569af982aba47aa
REF 9e8b86fd2d9806672cc73133d21780dd182bfd24 # v8.0.0
SHA512 1acf9936a559839b5605452cc8ae26632614a5936e6504d2f8f23cfa0715f39238d0f8b664e3a4962a2df97191cba15330af4f6ee358018800feb07b50e56f18
HEAD_REF master
PATCHES
fix-warning4189.patch
fix-write-batch.patch
)

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DFMT_CMAKE_DIR=share/fmt
-DFMT_TEST=OFF
-DFMT_DOC=OFF
)

vcpkg_cmake_install()
file(INSTALL ${SOURCE_PATH}/LICENSE.rst DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
if(VCPKG_TARGET_IS_WINDOWS)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
Expand All @@ -35,7 +34,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
endif()
endif()

vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fmt/core.h
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fmt/core.h"
"defined(FMT_SHARED)"
"1"
)
Expand All @@ -53,14 +52,14 @@ if(VCPKG_TARGET_IS_WINDOWS)
)
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake"
"lib/fmt.dll"
"bin/fmt.dll"
)
endif()
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

# Handle post-build CMake instructions
vcpkg_copy_pdbs()
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
3 changes: 1 addition & 2 deletions ports/fmt/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "fmt",
"version": "7.1.3",
"port-version": 5,
"version": "8.0.0",
"description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.",
"homepage": "https://github.com/fmtlib/fmt",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2057,8 +2057,8 @@
"port-version": 3
},
"fmt": {
"baseline": "7.1.3",
"port-version": 5
"baseline": "8.0.0",
"port-version": 0
},
"folly": {
"baseline": "2021.06.14.00",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/fmt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c0d57d9a63ba51c84b6649f58f45282beaa6f426",
"version": "8.0.0",
"port-version": 0
},
{
"git-tree": "52a5c56d85771a278330e955b703f4db86cfe86d",
"version": "7.1.3",
Expand Down