diff options
| author |  bunnei | 2020-04-17 19:47:30 -0400 |
|---|---|---|
| committer |  GitHub | 2020-04-17 19:47:30 -0400 |
| commit | fd7dc7e03dfc1df03c7015f34a513f1ecf5f013b (patch) | |
| tree | 7b5cbc6c7bceb403cacecf56c2a49f2235659d26 | |
| parent | Merge pull request #3630 from benru/open-windows-network-files (diff) | |
| parent | externals: Update fmt to 6.2.0 (diff) | |
| download | yuzu-fd7dc7e03dfc1df03c7015f34a513f1ecf5f013b.tar.gz yuzu-fd7dc7e03dfc1df03c7015f34a513f1ecf5f013b.tar.xz yuzu-fd7dc7e03dfc1df03c7015f34a513f1ecf5f013b.zip | |
Merge pull request #3704 from lioncash/fmt
externals: Update fmt to 6.2.0
| -rw-r--r-- | externals/CMakeLists.txt | 4 | ||||
| m--------- | externals/fmt | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index d4421f697..653c64f47 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt | |||
| @@ -16,11 +16,11 @@ add_library(catch-single-include INTERFACE) | |||
| 16 | target_include_directories(catch-single-include INTERFACE catch/single_include) | 16 | target_include_directories(catch-single-include INTERFACE catch/single_include) |
| 17 | 17 | ||
| 18 | # libfmt | 18 | # libfmt |
| 19 | pkg_check_modules(FMT IMPORTED_TARGET GLOBAL fmt>=6.1.0) | 19 | pkg_check_modules(FMT IMPORTED_TARGET GLOBAL fmt>=6.2.0) |
| 20 | if (FMT_FOUND) | 20 | if (FMT_FOUND) |
| 21 | add_library(fmt::fmt ALIAS PkgConfig::FMT) | 21 | add_library(fmt::fmt ALIAS PkgConfig::FMT) |
| 22 | else() | 22 | else() |
| 23 | message(STATUS "fmt 6.1.0 or newer not found, falling back to externals") | 23 | message(STATUS "fmt 6.2.0 or newer not found, falling back to externals") |
| 24 | add_subdirectory(fmt) | 24 | add_subdirectory(fmt) |
| 25 | add_library(fmt::fmt ALIAS fmt) | 25 | add_library(fmt::fmt ALIAS fmt) |
| 26 | endif() | 26 | endif() |
diff --git a/externals/fmt b/externals/fmt | |||
| Subproject 4b8f8fac96a7819f28f4be523ca10a2d5d8aaaf | Subproject 9bdd1596cef1b57b9556f8bef32dc4a32322ef3 | ||