diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-08-29 23:04:31 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-08-29 23:04:31 +0100 |
| commit | 98b3915bcc75b8b45659f17f3e4933429daadfd1 (patch) | |
| tree | c4d1c9ff452eddd4cdf058ee11ec8935e8721da4 | |
| parent | cb92077b0a6730f1d71931300ad293e29185c47d (diff) | |
Bump libcxml version; add versions back to cscript.
| -rw-r--r-- | cscript | 3 | ||||
| -rw-r--r-- | wscript | 4 |
2 files changed, 3 insertions, 4 deletions
@@ -4,8 +4,7 @@ def dependencies(target): if target.platform == 'windows': return () else: - # XXX: should be some versions in here - return (('libcxml', None), ('openjpeg-cdist', None)) + return (('libcxml', 'v0.05'), ('openjpeg-cdist', '6771627cfa63e315d2e23d81669cafcdc66ddc9f')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() @@ -49,8 +49,8 @@ def configure(conf): conf.env.HAVE_CXML = 1 conf.env.STLIB_CXML = ['cxml'] else: - conf.check_cfg(package = 'libopenjpeg', args = '--cflags --libs', uselib_store = 'OPENJPEG', mandatory = True) - conf.check_cfg(package = 'libcxml', args = '--cflags --libs', uselib_store = 'CXML', mandatory = True) + conf.check_cfg(package='libopenjpeg', args='--cflags --libs', uselib_store='OPENJPEG', mandatory=True) + conf.check_cfg(package='libcxml', atleast_version='0.05', args='--cflags --libs', uselib_store='CXML', mandatory=True) if conf.options.target_windows: boost_lib_suffix = '-mt' |
