From 1e324c3cac09ac886293f755d0c1527ece2f5244 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 24 Dec 2024 00:40:29 +0100 Subject: Configure with libfmt. --- src/lib/wscript | 2 +- src/tools/wscript | 2 +- test/wscript | 2 +- wscript | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/wscript b/src/lib/wscript index dfe3ce487..17d05fe7e 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -247,7 +247,7 @@ def build(bld): BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++ CURL ZIP BZ2 FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG JPEG LEQM_NRT - LIBZ SQLITE3 + LIBZ SQLITE3 FMT """ if bld.env.TARGET_OSX: diff --git a/src/tools/wscript b/src/tools/wscript index e6d7c4be1..f58c7362c 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -98,7 +98,7 @@ def configure(conf): def build(bld): uselib = 'BOOST_THREAD BOOST_DATETIME DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC ' uselib += 'AVUTIL SWSCALE SWRESAMPLE POSTPROC CURL BOOST_FILESYSTEM SSH ZIP CAIROMM FONTCONFIG PANGOMM SUB ' - uselib += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO PNG JPEG LEQM_NRT SQLITE3 ' + uselib += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO PNG JPEG LEQM_NRT SQLITE3 FMT ' if bld.env.ENABLE_DISK: if bld.env.TARGET_LINUX: diff --git a/test/wscript b/test/wscript index e32ec9acb..8e7d6530a 100644 --- a/test/wscript +++ b/test/wscript @@ -37,7 +37,7 @@ def build(bld): obj.name = 'unit-tests' obj.uselib = 'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP FONTCONFIG CAIROMM PANGOMM XMLPP ' obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE SWRESAMPLE POSTPROC CXML SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE PNG JPEG ' - obj.uselib += 'LEQM_NRT ZIP SQLITE3 ' + obj.uselib += 'LEQM_NRT ZIP SQLITE3 FMT ' if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32: obj.uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE ' if bld.env.TARGET_LINUX: diff --git a/wscript b/wscript index 09c93897e..073dade64 100644 --- a/wscript +++ b/wscript @@ -644,6 +644,7 @@ def configure(conf): define_name="DCPOMATIC_HAVE_SQLITE3_PREPARE_V3", mandatory=False) + conf.check_cfg(package='fmt', args='--cflags --libs', uselib_store='FMT', mandatory=True) # Other stuff -- cgit v1.2.3