From: Carl Hetherington <cth@carlh.net>
Date: Wed, 27 Mar 2019 00:23:49 +0000 (+0000)
Subject: Only build tests on Ubuntu 18.04 as we need BOOST_TEST.
X-Git-Tag: v1.8.0~457
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=1ca2f66168c24db875b9766601970427063c7726;p=libdcp.git

Only build tests on Ubuntu 18.04 as we need BOOST_TEST.
---

diff --git a/cscript b/cscript
index f4be59f1..60356765 100644
--- a/cscript
+++ b/cscript
@@ -46,14 +46,15 @@ def build(target, options):
         cmd += ' --jpeg=%s' % options['jpeg']
     if target.platform == 'linux':
         cmd += ' --static'
-        if target.distro == 'centos':
+        if not (target.distro == 'ubuntu' and target.version == '18.04'):
+            # We only build tests on Ubuntu 18.04
             cmd += ' --disable-tests'
-            if target.version == '7':
-                # Centos 7 ships with glibmm 2.50.0 which requires C++11
-                # but its compiler (gcc 4.8.5) defaults to C++97.  Go figure.
-                # I worry that this will cause ABI problems but I don't have
-                # a better solution.
-                cmd += ' --force-cpp11'
+        if target.distro == 'centos' and target.version == '7':
+            # Centos 7 ships with glibmm 2.50.0 which requires C++11
+            # but its compiler (gcc 4.8.5) defaults to C++97.  Go figure.
+            # I worry that this will cause ABI problems but I don't have
+            # a better solution.
+            cmd += ' --force-cpp11'
         if target.distro == 'mageia' and target.version == '6':
             # Mageia 6 pulls the same stunt except it's libxml++ that requires C++11
             cmd += ' --force-cpp11'