GreenPolyProducts/cantera
5
0
Fork 0
mirror of https://github.com/Cantera/cantera.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bump vendored fmt library to version 9.1.0

Browse Source 
This version properly exports all necessary DLL symbols, eliminating the
need to embed it separately in the Cython module.
This commit is contained in:
Ray Speth 2023-01-27 19:49:06 -05:00 committed by Ingmar Schoegl
parent ae9687ad36
commit 3c9af75f05
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/SConscript
View File

@ -40,8 +40,7 @@ if not env['system_fmt']:
license_files["fmtlib"] = File("#ext/fmt/LICENSE.rst") license_files["fmtlib"] = File("#ext/fmt/LICENSE.rst")
localenv = prep_default(env) localenv = prep_default(env)
localenv.Prepend(CPPPATH=Dir('#ext/fmt/include')) localenv.Prepend(CPPPATH=Dir('#ext/fmt/include'))
libraryTargets.extend( libraryTargets.extend(localenv.SharedObject(['fmt/src/format.cc', 'fmt/src/os.cc']))
localenv.SharedObject(multi_glob(localenv, 'fmt/src', 'cc')))
for name in ('format.h', 'ostream.h', 'printf.h', 'core.h', 'format-inl.h'): for name in ('format.h', 'ostream.h', 'printf.h', 'core.h', 'format-inl.h'):
ext_copies.extend( ext_copies.extend(
copyenv.Command("#include/cantera/ext/fmt/" + name, copyenv.Command("#include/cantera/ext/fmt/" + name,

2
ext/fmt

@ -1 +1 @@
Subproject commit 19bd751020a1f3c3363b2eb67a039852f139a8d3 Subproject commit a33701196adfad74917046096bf5a2aa0ab0bb50

5
interfaces/cython/SConscript
View File

@ -45,11 +45,6 @@ for pyxfile in multi_glob(localenv, "cantera", "pyx"):
cython_obj.append(obj) cython_obj.append(obj)
cython_obj.extend(env['python_ext_objects']) cython_obj.extend(env['python_ext_objects'])
if not env['system_fmt']:
# Workaround until we can figure out why all the necessary symbols aren't
# being exported from fmt
cython_obj.extend(localenv['fmt_targets'])
module_ext = localenv["py_module_ext"] module_ext = localenv["py_module_ext"]
ext = localenv.LoadableModule(f"cantera/_cantera{module_ext}", ext = localenv.LoadableModule(f"cantera/_cantera{module_ext}",
cython_obj, LIBPREFIX="", SHLIBSUFFIX=module_ext, cython_obj, LIBPREFIX="", SHLIBSUFFIX=module_ext,