diff --git a/.gitignore b/.gitignore index ad9243bfe..fd1651b13 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ build/ test/work/ include/cantera/base/config.h +include/cantera/ext/ interfaces/matlab/ctpath.m interfaces/matlab/Contents.m stage/ diff --git a/ext/SConscript b/ext/SConscript index 7b524f45e..1741f6dbf 100644 --- a/ext/SConscript +++ b/ext/SConscript @@ -47,9 +47,17 @@ def prep_gtest(env): CPPDEFINES={'GTEST_HAS_PTHREAD': 0}) return localenv +def prep_cppformat(env): + localenv = prep_default(env) + build(localenv.Command("#include/cantera/ext/format.h", + "#ext/cppformat/format.h", + [Mkdir("#include/cantera/ext"), + Copy('$TARGET', '$SOURCE')])) + return localenv # each element of libs is: (subdir, (file extensions), prepfunction) -libs = [('libexecstream', ['cpp'], prep_default)] +libs = [('libexecstream', ['cpp'], prep_default), + ('cppformat', ['cc'], prep_cppformat)] if env['build_with_f2c']: libs.append(('f2c_math', ['cpp','c'], prep_f2c))