The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[fmt] Update to 6.1.2 (#10080)

Browse Source 
* [fmt] Update to 6.1.2

* [spdlog] add patch to fix include missing

* [fmt] check if file exists before file(RENAME ...)

* [spdlog] bump version to 1.4.2-2

* [fmt][spdlog] Fix version number
This commit is contained in:
Curoky 2020-03-03 01:35:36 +08:00 committed by GitHub
parent c3ac3b24ff
commit 705764c635
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/fmt/CONTROL
View File

@ -1,4 +1,4 @@
Source: fmt Source: fmt
Version: 6.0.0-1 Version: 6.1.2
Homepage: https://github.com/fmtlib/fmt 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. Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.

12
ports/fmt/fix-warning4189.patch
View File

@ -1,12 +1,12 @@
diff --git a/include/fmt/format.h b/include/fmt/format.h 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 --- a/include/fmt/format.h
+++ b/include/fmt/format.h +++ b/include/fmt/format.h
@@ -33,6 +33,7 @@ @@ -35,6 +35,7 @@
#ifndef FMT_FORMAT_H_
#define FMT_FORMAT_H_ #include "core.h"
+#pragma warning(disable:4189) +#pragma warning(disable:4189)
#include <algorithm> #include <algorithm>
#include <cassert> #include <cerrno>
#include <cmath> #include <cmath>

16
ports/fmt/portfile.cmake
View File

@ -1,8 +1,8 @@
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO fmtlib/fmt REPO fmtlib/fmt
REF 6.0.0 REF 6.1.2
SHA512 7deb5bd843ae6b9d4b58dca9c68c1cfe7b55a41040f358247f5309655188d1ae194ff414437c068f74367f078faa214b5883e8c9e634c7623dcda50850e24766 SHA512 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7
HEAD_REF master HEAD_REF master
PATCHES fix-warning4189.patch PATCHES fix-warning4189.patch
) )
@ -20,12 +20,16 @@ file(INSTALL ${SOURCE_PATH}/LICENSE.rst DESTINATION ${CURRENT_PACKAGES_DIR}/shar
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) 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") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll")
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() endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/fmt.dll")
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()
endif() endif()

4
ports/spdlog/CONTROL
View File

@ -1,9 +1,9 @@
Source: spdlog Source: spdlog
Version: 1.4.2 Version: 1.4.2-1
Homepage: https://github.com/gabime/spdlog Homepage: https://github.com/gabime/spdlog
Description: Very fast, header only, C++ logging library Description: Very fast, header only, C++ logging library
Build-Depends: fmt Build-Depends: fmt
Feature: benchmark Feature: benchmark
Description: Use google benchmark Description: Use google benchmark
Build-Depends: benchmark Build-Depends: benchmark

12
ports/spdlog/fix-include.patch Normal file
View File

@ -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
ports/spdlog/portfile.cmake
View File

@ -9,6 +9,7 @@ vcpkg_from_github(
fix-feature-export.patch fix-feature-export.patch
fix-error-4275.patch fix-error-4275.patch
fix-uwp.patch fix-uwp.patch
fix-include.patch
) )
set(SPDLOG_USE_BENCHMARK OFF) set(SPDLOG_USE_BENCHMARK OFF)