Don't build benchmarks with cdist.

diff --git a/cscript b/cscript
index 42d708413e35099d931f87cc2ed6898d18160b35..66852a6700c7d5e6b236170d23c3450e80d78365 100644 (file)
--- a/cscript
+++ b/cscript
@@ -44,7 +44,7 @@ def dependencies(target, options):
         return (libcxml, ('openjpeg', '956af06'), ('asdcplib', 'carl'))
 
 def build(target, options):
-    cmd = './waf configure --disable-examples --prefix=%s' % target.directory
+    cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory
     cmd += ' --jpeg=%s' % options['jpeg']
     if target.platform == 'linux':
         cmd += ' --static'

diff --git a/wscript b/wscript
index 4c1c6146c92a448a14585a4a73caba6dc0264a9a..84fcfa714ad2483728c86a37aaa010fc9d034d4c 100644 (file)
--- a/wscript
+++ b/wscript
@@ -56,6 +56,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 statically, and link statically to openjpeg, cxml, asdcplib-carl')
     opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests')
+    opt.add_option('--disable-benchmarks', action='store_true', default=False, help='disable building of benchmarks')
     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')
     opt.add_option('--enable-openmp', action='store_true', default=False, help='enable use of OpenMP')
@@ -78,6 +79,7 @@ def configure(conf):
     conf.env.TARGET_OSX = sys.platform == 'darwin'
     conf.env.ENABLE_DEBUG = conf.options.enable_debug
     conf.env.DISABLE_TESTS = conf.options.disable_tests
+    conf.env.DISABLE_BENCHMARKS = conf.options.disable_benchmarks
     conf.env.DISABLE_EXAMPLES = conf.options.disable_examples
     conf.env.STATIC = conf.options.static
     conf.env.API_VERSION = API_VERSION
@@ -230,7 +232,8 @@ def build(bld):
         bld.recurse('test')
     if not bld.env.DISABLE_EXAMPLES:
         bld.recurse('examples')
-    bld.recurse('benchmark')
+    if not bld.env.DISABLE_BENCHMARKS:
+        bld.recurse('benchmark')
 
     for i in ['SMPTE-429-7-2006-CPL.xsd', 'SMPTE-429-8-2006-PKL.xsd', 'SMPTE-429-9-2007-AM.xsd', 'xmldsig-core-schema.xsd', 'XMLSchema.dtd', 'XMLSchema.xsd', 'xml.xsd', 'PROTO-ASDCP-CPL-20040511.xsd', 'PROTO-ASDCP-PKL-20040311.xsd', 'PROTO-ASDCP-AM-20040311.xsd', 'Main-Stereo-Picture-CPL.xsd' ]:
         bld.install_files('${PREFIX}/share/libdcp/xsd', os.path.join('xsd', i))