diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL index ce04fe4371a0b8..543bd03c0f4947 100644 --- a/ports/fmt/CONTROL +++ b/ports/fmt/CONTROL @@ -1,4 +1,4 @@ Source: fmt -Version: 6.2.1 +Version: 7.0.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. diff --git a/ports/fmt/fix-warning4189.patch b/ports/fmt/fix-warning4189.patch deleted file mode 100644 index 0efab0f1c98985..00000000000000 --- a/ports/fmt/fix-warning4189.patch +++ /dev/null @@ -1,12 +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,7 @@ - #ifndef FMT_FORMAT_H_ - #define FMT_FORMAT_H_ - -+#pragma warning(disable:4189) - #include - #include - #include diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index c44da534a6654c..e031860c703d33 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt - REF 19bd751020a1f3c3363b2eb67a039852f139a8d3#version 6.2.1 - SHA512 5d03445c64c3b7973bdf4e445238c63fa41bf0fa8c2d5b32cd56f0a6b3036b039d9c303a06300f3af87795a07f80f2ed28b90ddbf9c3f7398796d77906c21f40 + REF b9d749095e3397f154e2938f96dd11912f2d9300 #version 7.0.1 + SHA512 5e81369ba97fb9e7fbaeed87b23fc7f1db1459d5c67eba1d92a697840fa004097d714127381aa2aa1437f5730b27e38a71e3ddf6a4a73c8d5eeaa32b3efb3d80 HEAD_REF master - PATCHES fix-warning4189.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -45,14 +44,16 @@ vcpkg_fixup_pkgconfig() if(VCPKG_TARGET_IS_WINDOWS) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake FMT_DEBUG_MODULE) - string(REPLACE "lib/fmtd.dll" "bin/fmtd.dll" FMT_DEBUG_MODULE ${FMT_DEBUG_MODULE}) - file(WRITE ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake "${FMT_DEBUG_MODULE}") + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake + "lib/fmtd.dll" + "bin/fmtd.dll" + ) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake FMT_RELEASE_MODULE) - string(REPLACE "lib/fmt.dll" "bin/fmt.dll" FMT_RELEASE_MODULE ${FMT_RELEASE_MODULE}) - file(WRITE ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake "${FMT_RELEASE_MODULE}") + 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)