summaryrefslogtreecommitdiff
path: root/cscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-10-13 00:32:33 +0100
committerCarl Hetherington <cth@carlh.net>2018-10-13 00:32:33 +0100
commita90a1edb2a081155b3ec7976984c3fe2001ddbd6 (patch)
tree4a7f9d28b617a6122207cf2f855290475609a8e3 /cscript
parentfcae141027b04bb6375910ce2a40e98de4ddd808 (diff)
Try to only build tests on Ubuntu 18.04 for now (mostly because of ImageMagick).
Diffstat (limited to 'cscript')
-rw-r--r--cscript10
1 files changed, 6 insertions, 4 deletions
diff --git a/cscript b/cscript
index a985fa940..04d3746eb 100644
--- a/cscript
+++ b/cscript
@@ -334,16 +334,18 @@ def option_defaults():
def configure_options(target, options):
opt = ''
+
+ if target.platform != 'linux' or target.distro != 'ubuntu' or target.version != '18.04':
+ # Currently we only build tests on Ubuntu 18.04
+ opt += ' --disable-tests'
+
if target.debug:
opt += ' --enable-debug'
if target.platform == 'windows':
- opt += ' --target-windows --disable-tests'
- elif target.platform == 'osx':
- opt += ' --disable-tests'
+ opt += ' --target-windows'
elif target.platform == 'linux':
opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
if target.distro == 'centos':
- opt += ' --disable-tests'
if target.version == '6.5':
opt += ' --static-boost --static-xmlpp'
elif target.version == '7':