Skip to content

[fmt] Update to 6.1.2 #10080

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 5 commits into from
Mar 2, 2020
Merged

[fmt] Update to 6.1.2 #10080

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
163d65c
[fmt] Update to 6.1.2
curoky Feb 18, 2020
8fc1e91
[spdlog] add patch to fix include missing
curoky Feb 20, 2020
794f0b6
[fmt] check if file exists before file(RENAME ...)
curoky Feb 20, 2020
28b73f4
[spdlog] bump version to 1.4.2-2
curoky Feb 20, 2020
424e870
[fmt][spdlog] Fix version number
curoky Feb 28, 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.0.0-1
Version: 6.1.2-1

@strega-nil strega-nil Feb 28, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be 6.1.2, instead of 6.1.2-1

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.
12 changes: 6 additions & 6 deletions ports/fmt/fix-warning4189.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/include/fmt/format.h b/include/fmt/format.h
index efec5d6..9b15b48 100644
index 01f41f5c..208a58d0 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -33,6 +33,7 @@
#ifndef FMT_FORMAT_H_
#define FMT_FORMAT_H_
@@ -35,6 +35,7 @@

#include "core.h"

+#pragma warning(disable:4189)
#include <algorithm>
#include <cassert>
#include <cerrno>
#include <cmath>
16 changes: 10 additions & 6 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 6.0.0
SHA512 7deb5bd843ae6b9d4b58dca9c68c1cfe7b55a41040f358247f5309655188d1ae194ff414437c068f74367f078faa214b5883e8c9e634c7623dcda50850e24766
REF 6.1.2
SHA512 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7
HEAD_REF master
PATCHES fix-warning4189.patch
)
Expand All @@ -20,12 +20,16 @@ file(INSTALL ${SOURCE_PATH}/LICENSE.rst DESTINATION ${CURRENT_PACKAGES_DIR}/shar
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll)
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll")
Comment thread
strega-nil marked this conversation as resolved.
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")
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fmt.dll ${CURRENT_PACKAGES_DIR}/bin/fmt.dll)
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)
endif()
endif()
endif()

Expand Down
12 changes: 12 additions & 0 deletions ports/spdlog/fix-include.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/include/spdlog/common.h b/include/spdlog/common.h
index e1108a0a..b4faf26e 100644
--- a/include/spdlog/common.h
+++ b/include/spdlog/common.h
@@ -14,6 +14,7 @@
#include <string>
#include <type_traits>
#include <functional>
+#include <cassert>

#ifdef _WIN32
#ifndef NOMINMAX
1 change: 1 addition & 0 deletions ports/spdlog/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ vcpkg_from_github(
fix-feature-export.patch
fix-error-4275.patch
fix-uwp.patch
fix-include.patch
)

set(SPDLOG_USE_BENCHMARK OFF)
Expand Down