Update fmt

Author: vitaut

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "cppformat"]
-	path = cppformat
-	url = https://github.com/cppformat/cppformat.git
+[submodule "fmt"]
+	path = fmt
+	url = https://github.com/fmtlib/fmt.git
 [submodule "benchmark"]
 	path = benchmark
 	url = [email protected]:google/benchmark.git

CMakeLists.txt

@@ -19,14 +19,14 @@ endif ()
 # Use shared libraries to make comparison with IOStreams and printf
 # fair as these use shared libraries too (libstdc++ and libc).
 set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared library instead of static one")
-add_subdirectory(cppformat)
+add_subdirectory(fmt)
 
 find_package(Boost)
 if (Boost_FOUND)
   add_definitions(-DHAVE_BOOST)
   include_directories(${Boost_INCLUDE_DIRS})
   add_executable(int-generator int_generator.cpp ltoa.c)
-  target_link_libraries(int-generator cppformat)
+  target_link_libraries(int-generator fmt)
   find_library(HAVE_RT rt)
   if (HAVE_RT)
     target_link_libraries(int-generator rt)
@@ -41,7 +41,7 @@ if (PROFILER_LIB AND PROFILER_INCLUDE_DIR)
 endif ()
 
 add_executable(tinyformat_speed_test tinyformat_test.cpp)
-target_link_libraries(tinyformat_speed_test cppformat)
+target_link_libraries(tinyformat_speed_test fmt)
 if (HAVE_PROFILER)
   target_link_libraries(tinyformat_speed_test ${PROFILER_LIB})
   set(PROFILE_DEFS ";FMT_PROFILE")
@@ -91,12 +91,12 @@ endif()
 
 add_custom_target(bloat-test 
                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bloat-test.py -I${Boost_INCLUDE_DIRS}
-                  DEPENDS cppformat)
+                  DEPENDS fmt)
 
 add_custom_target(variadic-test 
                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/variadic-test.py
                           \${ARGS} -I${Boost_INCLUDE_DIRS}
-                  DEPENDS cppformat)
+                  DEPENDS fmt)
 
 enable_testing()
 add_subdirectory(benchmark)

bloat-test.py

@@ -27,9 +27,9 @@
     boost::format("%s:%d:%d:%d:%s\n") % "somefile.cpp" % 42 % 1 % 2 % "asdf";
 }
 
-#elif defined(USE_CPPFORMAT)
+#elif defined(USE_FMT)
 
-#include "cppformat/format.h"
+#include "fmt/format.h"
 
 void doFormat_a() {
   fmt::print("{}\n", "somefile.cpp");
@@ -139,7 +139,7 @@ def benchmark(flags):
   result.stripped_size = os.stat(output_filename).st_size
   print('Stripped size: {}'.format(result.stripped_size))
   p = Popen(['./' + output_filename], stdout=PIPE,
-            env={'LD_LIBRARY_PATH': 'cppformat'})
+            env={'LD_LIBRARY_PATH': 'fmt/fmt'})
   output = p.communicate()[0]
   global expected_output
   if not expected_output:
@@ -157,7 +157,7 @@ def benchmark(flags):
 methods = [
   ('printf'      , []),
   ('IOStreams'   , ['-DUSE_IOSTREAMS']),
-  ('C++ Format'  , ['-DUSE_CPPFORMAT', '-Lcppformat', '-lcppformat']),
+  ('fmt'         , ['-DUSE_FMT', '-Ifmt', 'fmt/fmt/libfmt.so']),
   ('tinyformat'  , ['-DUSE_TINYFORMAT']),
   ('Boost Format', ['-DUSE_BOOST'])
 ]

cppformat

@@ -59,7 +59,7 @@
 methods = [
   ('printf'      , []),
   ('IOStreams'   , ['-DUSE_IOSTREAMS']),
-  ('C++ Format'  , ['-DUSE_CPPFORMAT', '-Lcppformat', '-lcppformat']),
+  ('fmt'         , ['-DUSE_FMT', '-Lfmt', '-lfmt']),
   ('tinyformat'  , ['-DUSE_TINYFORMAT']),
   ('Boost Format', ['-DUSE_BOOST'])
 ]
@@ -70,7 +70,7 @@
     'sep': ' % ',
     'specifier': '%{type}',
   },
-  'cppformat': {
+  'fmt': {
     'statement': r'fmt::print("{fmt_str}\n", {args});',
     'sep': ', ',
     'specifier': '{{:{type}}}',
@@ -100,11 +100,11 @@
 
 {boost}
 
-#elif defined(USE_CPPFORMAT)
+#elif defined(USE_FMT)
 
-#include "cppformat/format.h"
+#include "fmt/format.h"
 
-{cppformat}
+{fmt}
 
 #elif defined(USE_IOSTREAMS)
 
@@ -295,7 +295,7 @@ def measure_compile(compiler_path, sources, flags):
   result['stripped_size'] = os.stat(output_filename).st_size
 
   p = Popen(['./' + output_filename], stdout=PIPE,
-            env={'LD_LIBRARY_PATH': 'cppformat'})
+            env={'LD_LIBRARY_PATH': 'fmt'})
   result['output'] = p.communicate()[0]
   sys.stdout.flush()