diff options
| author | Curoky <cccuroky@gmail.com> | 2020-03-03 01:35:36 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 09:35:36 -0800 |
| commit | 705764c63549953c049b34c7a2d67b377d0bd006 (patch) | |
| tree | 7bf5b86b4d5df51fabe9d7c2a4377021c0fcd3d6 /ports/fmt | |
| parent | c3ac3b24ffbc1c6e4fb759c8cd8e7a5aff9a3b94 (diff) | |
| download | vcpkg-705764c63549953c049b34c7a2d67b377d0bd006.tar.gz vcpkg-705764c63549953c049b34c7a2d67b377d0bd006.zip | |
[fmt] Update to 6.1.2 (#10080)
* [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
Diffstat (limited to 'ports/fmt')
| -rw-r--r-- | ports/fmt/CONTROL | 2 | ||||
| -rw-r--r-- | ports/fmt/fix-warning4189.patch | 12 | ||||
| -rw-r--r-- | ports/fmt/portfile.cmake | 16 |
3 files changed, 17 insertions, 13 deletions
diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL index cdbb9362d..48f758b10 100644 --- a/ports/fmt/CONTROL +++ b/ports/fmt/CONTROL @@ -1,4 +1,4 @@ Source: fmt -Version: 6.0.0-1 +Version: 6.1.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. diff --git a/ports/fmt/fix-warning4189.patch b/ports/fmt/fix-warning4189.patch index 9b52d4926..5c2537954 100644 --- a/ports/fmt/fix-warning4189.patch +++ b/ports/fmt/fix-warning4189.patch @@ -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> diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index 238272b86..bc21d97a3 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -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 ) @@ -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") + 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() |