Use release version of libcxml.
authorCarl Hetherington <cth@carlh.net>
Mon, 31 Oct 2016 15:54:35 +0000 (15:54 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 31 Oct 2016 15:54:35 +0000 (15:54 +0000)
cscript
wscript

diff --git a/cscript b/cscript
index 939de06c9986c4fb129f7f23d33fd2acd78d8207..82f4b2bdeb2e66fec66ff6664851556284e77121 100644 (file)
--- a/cscript
+++ b/cscript
@@ -35,9 +35,9 @@ import os
 
 def dependencies(target):
     if target.platform == 'windows' and target.version == 'xp':
-        return (('libcxml', 'c1348c5'), ('openjpeg-cdist',  '5d8bffd'), ('asdcplib-cth', '213c9f8'))
+        return (('libcxml', 'v0.15.2'), ('openjpeg-cdist',  '5d8bffd'), ('asdcplib-cth', '213c9f8'))
     else:
-        return (('libcxml', 'c1348c5'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', '213c9f8'))
+        return (('libcxml', 'v0.15.2'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', '213c9f8'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --prefix=%s' % target.directory
diff --git a/wscript b/wscript
index bbff5a4607becfe83a633be30385948718b44b2d..ffc08bf438f6473f425e42a904fec1068d8f029a 100644 (file)
--- a/wscript
+++ b/wscript
@@ -126,7 +126,7 @@ def configure(conf):
         elif conf.options.jpeg == 'oj1':
             conf.check_cfg(package='libopenjpeg1', args='--cflags --libs', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True)
         conf.check_cfg(package='libasdcp-cth', atleast_version='0.1.0', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True)
-        conf.check_cfg(package='libcxml', atleast_version='0.15.1', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+        conf.check_cfg(package='libcxml', atleast_version='0.15.2', args='--cflags --libs', uselib_store='CXML', mandatory=True)
 
     if conf.options.target_windows:
         boost_lib_suffix = '-mt'