Adjust handling of -Wsuggest-override

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index d1b9fd46d7d2d34c7483f90973ff85459d30ab25..994f1b6f3e7aee7c90de95c21dba1272849f3cff 100644 (file)
--- a/wscript
+++ b/wscript
@@ -35,8 +35,8 @@ except ImportError:
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-libdcp_version = '1.8.5'
-libsub_version = '1.6.5'
+libdcp_version = '1.8.13'
+libsub_version = '1.6.13'
 
 this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
 last_version = subprocess.Popen(shlex.split('git describe --tags --match v* --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
@@ -126,6 +126,10 @@ def configure(conf):
         if int(gcc[0]) >= 8:
             # I tried and failed to ignore these with _Pragma
             conf.env.append_value('CXXFLAGS', ['-Wno-cast-function-type'])
+        if int(gcc[0]) >= 9:
+            # I can't get #pragma GCC diagnostic ignored "-Wsuggest-override" to work on older GCCs,
+            # so only enable this if we're on a newer one
+            conf.env.append_value('CXXFLAGS', '-Wsuggest-override')
         have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1
         # Most gccs still give these warnings from boost::optional
         conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized'])