summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-11-17 19:42:14 +0000
committerCarl Hetherington <cth@carlh.net>2015-11-17 21:00:45 +0000
commit2aeb895aa5c05e0db6cfa36bef2d6d8cb2e59bfa (patch)
tree868013b59e73df9f2ffc45254fa0768c165774e6 /wscript
parent609aa163d80bcd1ccfcda96c971df048f90c5cb3 (diff)
Fix uninitialised variable; Win32 build fixes.
Diffstat (limited to 'wscript')
-rw-r--r--wscript4
1 files changed, 3 insertions, 1 deletions
diff --git a/wscript b/wscript
index b87022f6..3c475848 100644
--- a/wscript
+++ b/wscript
@@ -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):