diff options
| author | Matt Haynie <mrhaynie@live.com> | 2021-07-01 08:26:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-01 08:26:35 -0700 |
| commit | 9a7d5a29dd0e066ff4a7dbeba4bd8af4daae8b60 (patch) | |
| tree | af0865cf34f1887cede01d371eb5a15900102854 | |
| parent | 9e7cb8379e1b77eae37589826b9bc3bd440033da (diff) | |
| download | vcpkg-9a7d5a29dd0e066ff4a7dbeba4bd8af4daae8b60.tar.gz vcpkg-9a7d5a29dd0e066ff4a7dbeba4bd8af4daae8b60.zip | |
[fmt] Fix an easily avoidable compilation warning (#18622)
* Fix an unconditional #pragma warning breaking other compilers.
* Increase fmt version
* re-ran vcpkg x-add-version --all --overwrite-version, this time it produced a different result for some reason
| -rw-r--r-- | ports/fmt/fix-warning4189.patch | 6 | ||||
| -rw-r--r-- | ports/fmt/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/fmt.json | 5 |
4 files changed, 11 insertions, 4 deletions
diff --git a/ports/fmt/fix-warning4189.patch b/ports/fmt/fix-warning4189.patch index 0efab0f1c..76431c367 100644 --- a/ports/fmt/fix-warning4189.patch +++ b/ports/fmt/fix-warning4189.patch @@ -2,11 +2,13 @@ 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 @@ +@@ -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/vcpkg.json b/ports/fmt/vcpkg.json index 232801247..b55b731cc 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fmt", "version": "7.1.3", - "port-version": 4, + "port-version": 5, "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 5a7a9e997..eaaf588c4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2054,7 +2054,7 @@ }, "fmt": { "baseline": "7.1.3", - "port-version": 4 + "port-version": 5 }, "folly": { "baseline": "2020.10.19.00", diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index 69976a238..13c7be172 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "52a5c56d85771a278330e955b703f4db86cfe86d", + "version": "7.1.3", + "port-version": 5 + }, + { "git-tree": "230e140a15afbb9089537e153d8b83f5b994adbe", "version": "7.1.3", "port-version": 4 |