X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=5478dd9e4b08da7d521019c65260a290918f9cbd;hb=8f10ce6c1f4c3c3eff410e8a69c665bcef506fee;hp=b87022f6cd8fc8093be18f2a4306315309f34c6d;hpb=796fa81d678eac8a764c17cce83fc5786bbeafb4;p=libdcp.git

diff --git a/wscript b/wscript
index b87022f6..5478dd9e 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'libdcp'
-VERSION = '1.2.8devel'
+VERSION = '1.2.10'
 API_VERSION = '-1.0'
 
 def options(opt):
@@ -14,6 +14,7 @@ def options(opt):
     opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation')
     opt.add_option('--static', action='store_true', default=False, help='build libdcp and in-tree dependencies statically, and link statically to openjpeg and cxml')
     opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests')
+    opt.add_option('--disable-gcov', action='store_true', default=False, help='don''t use gcov in tests')
     opt.add_option('--disable-examples', action='store_true', default=False, help='disable building of examples')
 
 def configure(conf):
@@ -122,7 +123,8 @@ def configure(conf):
 
     if not conf.env.DISABLE_TESTS:
         conf.recurse('test')
-        conf.check(lib='gcov', define_name='HAVE_GCOV', mandatory=False)
+        if not conf.options.disable_gcov:
+            conf.check(lib='gcov', define_name='HAVE_GCOV', mandatory=False)
     conf.recurse('asdcplib')
 
 def build(bld):
@@ -169,7 +171,7 @@ def create_version_cc(bld, version):
             debug_string = 'true'
         else:
             debug_string = 'false'
-        text += 'bool const built_with_debug = %s;\n' % debug_string
+        text += 'bool const dcp::built_with_debug = %s;\n' % debug_string
         print('Writing version information to src/version.cc')
         o = open('src/version.cc', 'w')
         o.write(text)