Update fmt to version 3.0.0 and fix compatibility issues
Resolves #349.
This commit is contained in:
parent
f985169e93
commit
4e23793ebd
7 changed files with 10 additions and 5 deletions
|
|
@ -26,9 +26,12 @@ def prep_gtest(env):
|
|||
def prep_fmt(env):
|
||||
localenv = prep_default(env)
|
||||
license_files.append(('fmtlib', 'fmt/LICENSE.rst'))
|
||||
build(localenv.Command("#include/cantera/ext/format.h",
|
||||
build(localenv.Command("#include/cantera/ext/fmt/format.h",
|
||||
"#ext/fmt/fmt/format.h",
|
||||
Copy('$TARGET', '$SOURCE')))
|
||||
build(localenv.Command("#include/cantera/ext/fmt/ostream.h",
|
||||
"#ext/fmt/fmt/ostream.h",
|
||||
Copy('$TARGET', '$SOURCE')))
|
||||
return localenv
|
||||
|
||||
# each element of libs is: (subdir, (file extensions), prepfunction)
|
||||
|
|
|
|||
2
ext/fmt
2
ext/fmt
|
|
@ -1 +1 @@
|
|||
Subproject commit 404219826238b50c8a56e97aa5f513a97ec6b86b
|
||||
Subproject commit e5e4fb370ccf327bbdcdcd782eb3e53580e11094
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
#include <exception>
|
||||
#include <string>
|
||||
#include "cantera/ext/format.h"
|
||||
#include "cantera/ext/fmt/format.h"
|
||||
|
||||
namespace Cantera
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#define CT_GLOBAL_H
|
||||
|
||||
#include "ct_defs.h"
|
||||
#include "cantera/ext/format.h"
|
||||
#include "cantera/ext/fmt/format.h"
|
||||
|
||||
namespace Cantera
|
||||
{
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
#define CT_STRINGUTILS_H
|
||||
|
||||
#include "ct_defs.h"
|
||||
#include "cantera/ext/format.h"
|
||||
#include "cantera/ext/fmt/format.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
#include "cantera/kinetics.h"
|
||||
#include "cantera/kinetics/ImplicitSurfChem.h"
|
||||
#include "cantera/kinetics/solveSP.h"
|
||||
#include "cantera/ext/fmt/ostream.h"
|
||||
#include <cstdio>
|
||||
#include <fstream>
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ static void printUsage()
|
|||
#include "cantera/kinetics.h"
|
||||
#include "cantera/kinetics/ImplicitSurfChem.h"
|
||||
#include "cantera/kinetics/solveSP.h"
|
||||
#include "cantera/ext/fmt/ostream.h"
|
||||
#include <cstdio>
|
||||
#include <fstream>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue