Update cppformat (now fmt)

Update to current master (pre-3.0), and change remote repository to reflect name
change from cppformat to fmt. Needed to be updated now because one of the
submodules referenced in the 1.1.0 release no longer exists due to the change in
the Github organization name from cppformat to fmtlib.

.gitmodules

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

SConstruct

@@ -732,20 +732,20 @@ def config_error(message):
 if not conf.CheckCXXHeader('cmath', '<>'):
     config_error('The C++ compiler is not correctly configured.')
 
-# Check for cppformat and checkout submodule if needed
-if not os.path.exists('ext/cppformat/format.h'):
+# Check for fmt library and checkout submodule if needed
+if not os.path.exists('ext/fmt/fmt/format.h'):
     if not os.path.exists('.git'):
-        config_error('Cppformat is missing. Install source in ext/cppformat.')
+        config_error('fmt is missing. Install source in ext/fmt.')
 
     try:
         code = subprocess.call(['git','submodule','update','--init',
-                                '--recursive','ext/cppformat'])
+                                '--recursive','ext/fmt'])
     except Exception:
         code = -1
     if code:
-        config_error('Cppformat submodule checkout failed.\n'
+        config_error('fmt submodule checkout failed.\n'
                      'Try manually checking out the submodule with:\n\n'
-                     '    git submodule update --init --recursive ext/cppformat\n')
+                     '    git submodule update --init --recursive ext/fmt\n')
 
 # Check for googletest and checkout submodule if needed
 if env['system_googletest'] in ('y', 'default'):

ext/SConscript

@@ -41,16 +41,16 @@ def prep_gtest(env):
                     CPPDEFINES={'GTEST_HAS_PTHREAD': 0})
     return localenv
 
-def prep_cppformat(env):
+def prep_fmt(env):
     localenv = prep_default(env)
     build(localenv.Command("#include/cantera/ext/format.h",
-                           "#ext/cppformat/format.h",
+                           "#ext/fmt/fmt/format.h",
                            Copy('$TARGET', '$SOURCE')))
     return localenv
 
 # each element of libs is: (subdir, (file extensions), prepfunction)
 libs = [('libexecstream', ['cpp'], prep_default),
-        ('cppformat', ['cc'], prep_cppformat)]
+        ('fmt/fmt', ['cc'], prep_fmt)]
 
 if env['build_with_f2c']:
     libs.append(('f2c_math', ['cpp','c'], prep_f2c))

ext/cppformat

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

ext/fmt

@@ -0,0 +1 @@
+Subproject commit 404219826238b50c8a56e97aa5f513a97ec6b86b

include/cantera/base/global.h

@@ -161,7 +161,7 @@ inline void debuglog(const std::string& msg, int loglevel)
 }
 
 //! @copydoc Application::Messages::writelog(const std::string&)
-//! This function passes its arguments to the cppformat 'format' function to
+//! This function passes its arguments to the fmt library 'format' function to
 //! generate a formatted string from a Python-style (curly braces) format
 //! string.
 template <typename... Args>