Some new features in dcpkdm.

[libdcp.git] / wscript

diff --git a/wscript b/wscript
index 1d35e9ac43936b0e821f1c728ad11f245a6e2d85..b10aaf28d6c593864c68c91c451cad6cfbeac2af 100644 (file)
--- a/wscript
+++ b/wscript
@@ -43,11 +43,6 @@ APPNAME = 'libdcp'
 this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
 last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
 
-if isinstance(this_version, bytes):
-    this_version = this_version.decode('UTF-8')
-if isinstance(last_version, bytes):
-    last_version = last_version.decode('UTF-8')
-
 if this_version == '':
     VERSION = '%sdevel' % last_version[1:].strip()
 else:
@@ -147,7 +142,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.3', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True)
-        conf.check_cfg(package='libcxml', atleast_version='0.15.2', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+        conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
 
     if conf.options.target_windows:
         boost_lib_suffix = '-mt'
@@ -202,6 +197,7 @@ def configure(conf):
         conf.recurse('test')
         if not conf.options.disable_gcov:
             conf.check(lib='gcov', define_name='HAVE_GCOV', mandatory=False)
+            conf.env.append_value('LINKFLAGS', '-fprofile-arcs')
 
 def build(bld):
     create_version_cc(bld, VERSION)