diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-01-18 12:39:32 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-12-03 17:02:35 +0100 |
| commit | b8d5991589f5294c0254a508a45c3d48e8e35929 (patch) | |
| tree | d961d4ee25d7d7a75fc3af2a35fc83df29d93f00 | |
| parent | bc9484b80080b4e77ed813bfd340f59ba1e10335 (diff) | |
Build fix.
| -rw-r--r-- | src/wscript | 2 | ||||
| -rw-r--r-- | wscript | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/wscript b/src/wscript index 638a89d..62e9b21 100644 --- a/src/wscript +++ b/src/wscript @@ -5,7 +5,7 @@ def configure(conf): # every time it changes s = conf.env.VERSION.split('.') major_minor = '%s.%s.0' % (s[0], s[1]) - conf.env.append_value('CXXFLAGS', '-DPACKAGE_VERSION="%s"' % major_minor) + conf.env.append_value('CXXFLAGS', ['-DPACKAGE_VERSION="%s"' % major_minor]) if conf.options.target_windows: conf.env.append_value('CXXFLAGS', '-DASDCP_PLATFORM="win32"') conf.env.append_value('CXXFLAGS', '-DKM_WIN32') @@ -8,8 +8,8 @@ from waflib import Logs APPNAME = 'libasdcp-cth' if os.path.exists('.git'): - this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0].decode('UTF-8') - last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0].decode('UTF-8') + 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 --abbrev=0'), stdout=subprocess.PIPE).communicate()[0] if this_version == '': VERSION = '%sdevel' % last_version[1:].strip() else: |