Bump libsub.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index dce57b29b1b64c271970c56ce7051771da29012f..c48cdcff9854a8e2547447cc9d614d25399a5ade 100644 (file)
--- a/wscript
+++ b/wscript
@@ -29,7 +29,7 @@ from waflib import Logs, Context
 APPNAME = 'dcpomatic'
 
 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 --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
+last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
 
 if this_version == '':
     VERSION = '%sdevel' % last_version[1:].strip()
@@ -63,6 +63,7 @@ def options(opt):
 
 def configure(conf):
     conf.load('compiler_cxx')
+    conf.load('clang_compilation_database', tooldir=['waf-tools'])
     if conf.options.target_windows:
         conf.load('winres')