diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-26 21:21:14 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-26 21:21:14 +0100 |
| commit | 01af7d4330b99fd0bbf3c195f5a6206c7a1f6050 (patch) | |
| tree | 2d72ea2ac54316de00f65e1f0f4729ef908429b2 | |
| parent | 130b5dc1d918194ceec756d2388c33665efcc169 (diff) | |
Use a release version of libcxml.
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | wscript | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -1,7 +1,7 @@ import os def dependencies(target): - return (('libcxml', 'f35787e'), ('openjpeg-cdist', '5d8bffd')) + return (('libcxml', 'v0.12.0'), ('openjpeg-cdist', '5d8bffd')) def build(target, options): cmd = './waf configure --prefix=%s' % target.directory @@ -51,12 +51,12 @@ def configure(conf): } """, msg='Checking for library openjpeg', stlib='openjpeg', uselib_store='OPENJPEG', mandatory=True) - + 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', atleast_version='0.11.0', args='--cflags --libs', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='libcxml', atleast_version='0.12.0', args='--cflags --libs', uselib_store='CXML', mandatory=True) if conf.options.target_windows: boost_lib_suffix = '-mt' |
