Use check_via_pkg_config for libdcp to clarify the error when
authorCarl Hetherington <cth@carlh.net>
Sat, 20 May 2023 20:51:17 +0000 (22:51 +0200)
committerCarl Hetherington <cth@carlh.net>
Mon, 6 May 2024 18:42:14 +0000 (20:42 +0200)
you have an old libdcp installed.

wscript

diff --git a/wscript b/wscript
index 7defd05d729fc2f55f2fc71f36c4e6d6d9a4180d..65f2e843fd7908d81dd62e985f91be1c8ec14b95 100644 (file)
--- a/wscript
+++ b/wscript
@@ -384,12 +384,12 @@ def configure(conf):
 
     # libdcp
     if conf.options.static_dcp:
-        conf.check_cfg(package='libdcp-1.0', args='libdcp-1.0 >= %s --cflags' % libdcp_version, uselib_store='DCP', mandatory=True)
+        check_via_pkg_config(conf, 'libdcp-1.0', 'DCP', mandatory=True, static=True, minimum_version=libdcp_version)
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
         conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-dcpomatic', 'kumu-dcpomatic', 'openjp2']
         conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt', 'xerces-c']
     else:
-        conf.check_cfg(package='libdcp-1.0', args='libdcp-1.0 >= %s --cflags --libs' % libdcp_version, uselib_store='DCP', mandatory=True)
+        check_via_pkg_config(conf, 'libdcp-1.0', 'DCP', mandatory=True, static=False, minimum_version=libdcp_version)
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
 
     # libsub