Browse Source

Merge pull request #2732 from yuriks/add-fmt

Add the fmt string formatting library
Yuri Kunde Schlesner 9 years ago
parent
commit
ec8dfc8fb7
5 changed files with 7 additions and 1 deletions
  1. 3 0
      .gitmodules
  2. 1 0
      CMakeLists.txt
  3. 1 0
      externals/CMakeLists.txt
  4. 1 1
      externals/dynarmic
  5. 1 0
      externals/fmt

+ 3 - 0
.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

+ 1 - 0
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)

+ 1 - 0
externals/CMakeLists.txt

@@ -9,3 +9,4 @@ endif()
 
 add_subdirectory(cryptopp)
 
+add_subdirectory(fmt)

+ 1 - 1
externals/dynarmic

@@ -1 +1 @@
-Subproject commit 358cf7c32205a5114964865c86a8455daf810732
+Subproject commit 7707ff13e981b0aecf87f3156ee0b641469f7bb3

+ 1 - 0
externals/fmt

@@ -0,0 +1 @@
+Subproject commit ac5484c4e7365b59d8c7e14db6778de26635e428