Merge pull request #2732 from yuriks/add-fmt

Add the fmt string formatting library

5 files changed, 5 insertions, 0 deletions

diff --git a/.gitmodules b/.gitmodules
index f98725622..36caa59f8 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 306959e24..121b0f2f8 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 309e98464..57fc5d566 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