aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>2021-09-08 02:55:54 +0800
committerGitHub <noreply@github.com>2021-09-07 11:55:54 -0700
commite67f76161cc087650ede0d8b834312b5a430d675 (patch)
treeee9e4918471d6249eae029fefea606d0768b1629
parent71422c627264daedcbcd46f01f1ed0dcd8460f1b (diff)
downloadvcpkg-e67f76161cc087650ede0d8b834312b5a430d675.tar.gz
vcpkg-e67f76161cc087650ede0d8b834312b5a430d675.zip
[fmt] update to 8.0.1 (#18581)
* [fmt] update to 8.0.0 * update version * revert patch foramt * update version * update version * [fmt] update to 8.0.0 * update version * [fmt] update to 8.0.1 * update version * Apply suggested change * update version
-rw-r--r--ports/fmt/fix-warning4189.patch14
-rw-r--r--ports/fmt/portfile.cmake23
-rw-r--r--ports/fmt/vcpkg.json3
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/f-/fmt.json5
5 files changed, 19 insertions, 30 deletions
diff --git a/ports/fmt/fix-warning4189.patch b/ports/fmt/fix-warning4189.patch
deleted file mode 100644
index 76431c367..000000000
--- a/ports/fmt/fix-warning4189.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/include/fmt/format.h b/include/fmt/format.h
-index 4e96539..0f1d179 100644
---- a/include/fmt/format.h
-+++ b/include/fmt/format.h
-@@ -33,6 +33,9 @@
- #ifndef FMT_FORMAT_H_
- #define FMT_FORMAT_H_
-
-+#ifdef _MSC_VER
-+#pragma warning(disable:4189)
-+#endif
- #include <algorithm>
- #include <cerrno>
- #include <cmath>
diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake
index bdaa65876..39208f6fb 100644
--- a/ports/fmt/portfile.cmake
+++ b/ports/fmt/portfile.cmake
@@ -1,16 +1,15 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO fmtlib/fmt
- REF 7bdf0628b1276379886c7f6dda2cef2b3b374f0b # v7.1.3
- SHA512 52ea8f9d2c0cb52ec3a740e38fcdfd6a0318566e3b599bd2e8d557168642d005c0a59bc213cff2641a88fed3bb771d15f46c39035ccd64809569af982aba47aa
+ REF d141cdbeb0fb422a3fb7173b285fd38e0d1772dc # v8.0.1
+ SHA512 1171f0305bed07497d2957b4053e8802030f448921c5bc1b066345dc1e77fbdb96d2c7f323452a32278ae4adb01e69e80b816119b0821e37d50980800e7406f8
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
@@ -18,19 +17,19 @@ vcpkg_cmake_configure(
)
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")
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll")
- file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
- file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll)
+ file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
+ file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll")
endif()
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/fmt.dll")
- file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
- file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fmt.dll ${CURRENT_PACKAGES_DIR}/bin/fmt.dll)
+ file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
+ file(RENAME "${CURRENT_PACKAGES_DIR}/lib/fmt.dll" "${CURRENT_PACKAGES_DIR}/bin/fmt.dll")
endif()
endif()
endif()
@@ -40,7 +39,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
"1"
)
endif()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
vcpkg_cmake_config_fixup()
vcpkg_fixup_pkgconfig()
@@ -59,8 +58,8 @@ if(VCPKG_TARGET_IS_WINDOWS)
)
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}")
diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json
index b55b731cc..67e7d2041 100644
--- a/ports/fmt/vcpkg.json
+++ b/ports/fmt/vcpkg.json
@@ -1,7 +1,6 @@
{
"name": "fmt",
- "version": "7.1.3",
- "port-version": 5,
+ "version-semver": "8.0.1",
"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": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 07b4d96bc..0e9114392 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2097,8 +2097,8 @@
"port-version": 3
},
"fmt": {
- "baseline": "7.1.3",
- "port-version": 5
+ "baseline": "8.0.1",
+ "port-version": 0
},
"folly": {
"baseline": "2021.06.14.00",
diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json
index 13c7be172..563687b9e 100644
--- a/versions/f-/fmt.json
+++ b/versions/f-/fmt.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "105214e3085a1404bca0fa89e7d80aa016e8cacb",
+ "version-semver": "8.0.1",
+ "port-version": 0
+ },
+ {
"git-tree": "52a5c56d85771a278330e955b703f4db86cfe86d",
"version": "7.1.3",
"port-version": 5