diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-05-27 15:03:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-27 15:03:53 -0700 |
| commit | ec8dfc8fb7218e5c552c42d30a68e13e350c3d0e (patch) | |
| tree | 4727b5fcbb7e68a95e99f664a350e27785d46905 | |
| parent | 96528b3aab159f646042dd7a287483cf50e3c0b1 (diff) | |
| parent | a06220682cd4fb56f4db1eec7cdf647d3e21d88a (diff) | |
Merge pull request #2732 from yuriks/add-fmt
Add the fmt string formatting library
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 1 | ||||
| m--------- | externals/dynarmic | 0 | ||||
| m--------- | externals/fmt | 0 |
5 files changed, 5 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index f987256221..36caa59f81 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "cryptopp"] path = externals/cryptopp/cryptopp url = https://github.com/weidai11/cryptopp.git +[submodule "fmt"] + path = externals/fmt + url = https://github.com/fmtlib/fmt.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 306959e242..121b0f2f84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -258,6 +258,7 @@ add_subdirectory(${INI_PREFIX}) add_subdirectory(externals) option(DYNARMIC_TESTS OFF) +set(DYNARMIC_NO_BUNDLED_FMT ON) add_subdirectory(externals/dynarmic) add_subdirectory(externals/glad) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 309e98464a..57fc5d5662 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -9,3 +9,4 @@ endif() add_subdirectory(cryptopp) +add_subdirectory(fmt) diff --git a/externals/dynarmic b/externals/dynarmic -Subproject 358cf7c32205a5114964865c86a8455daf81073 +Subproject 7707ff13e981b0aecf87f3156ee0b641469f7bb diff --git a/externals/fmt b/externals/fmt new file mode 160000 +Subproject ac5484c4e7365b59d8c7e14db6778de26635e42 |