From 3c9af75f0537f0378e6d0406b0b3a72753766044 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Fri, 27 Jan 2023 19:49:06 -0500 Subject: [PATCH] Bump vendored fmt library to version 9.1.0 This version properly exports all necessary DLL symbols, eliminating the need to embed it separately in the Cython module. --- ext/SConscript | 3 +-- ext/fmt | 2 +- interfaces/cython/SConscript | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ext/SConscript b/ext/SConscript index eb1073e99..81c664a75 100644 --- a/ext/SConscript +++ b/ext/SConscript @@ -40,8 +40,7 @@ if not env['system_fmt']: license_files["fmtlib"] = File("#ext/fmt/LICENSE.rst") localenv = prep_default(env) localenv.Prepend(CPPPATH=Dir('#ext/fmt/include')) - libraryTargets.extend( - localenv.SharedObject(multi_glob(localenv, 'fmt/src', 'cc'))) + libraryTargets.extend(localenv.SharedObject(['fmt/src/format.cc', 'fmt/src/os.cc'])) for name in ('format.h', 'ostream.h', 'printf.h', 'core.h', 'format-inl.h'): ext_copies.extend( copyenv.Command("#include/cantera/ext/fmt/" + name, diff --git a/ext/fmt b/ext/fmt index 19bd75102..a33701196 160000 --- a/ext/fmt +++ b/ext/fmt @@ -1 +1 @@ -Subproject commit 19bd751020a1f3c3363b2eb67a039852f139a8d3 +Subproject commit a33701196adfad74917046096bf5a2aa0ab0bb50 diff --git a/interfaces/cython/SConscript b/interfaces/cython/SConscript index ff394803e..2b63f14b5 100644 --- a/interfaces/cython/SConscript +++ b/interfaces/cython/SConscript @@ -45,11 +45,6 @@ for pyxfile in multi_glob(localenv, "cantera", "pyx"): cython_obj.append(obj) 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"] ext = localenv.LoadableModule(f"cantera/_cantera{module_ext}", cython_obj, LIBPREFIX="", SHLIBSUFFIX=module_ext,