summaryrefslogtreecommitdiff
path: root/mesonbuild/coredata.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-06-05 13:00:57 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-06-05 13:00:57 +0300
commit0bc00560644d20daee626533fc6e6294d92caa78 (patch)
treeef21d8363c6943a3f18a33b07c9226ff6231164b /mesonbuild/coredata.py
parent177e286b3c761f461ac55ede934b941384b4bb97 (diff)
parentfba749fcb7a9654db78d45157477589e4352c2e1 (diff)
downloadmeson-0bc00560644d20daee626533fc6e6294d92caa78.tar.gz
Merge pull request #577 from nioncode/vs2015
Implement vs2015 backend
Diffstat (limited to 'mesonbuild/coredata.py')
-rw-r--r--mesonbuild/coredata.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py
index 837681c3e..5f00ac341 100644
--- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py
@@ -16,6 +16,7 @@ import pickle, os, uuid
from .mesonlib import MesonException, default_libdir, default_libexecdir, default_prefix
version = '0.32.0.dev1'
+backendlist = ['ninja', 'vs2010', 'vs2015', 'xcode']
class UserOption:
def __init__(self, name, description, choices):
@@ -212,7 +213,7 @@ builtin_options = {
'warning_level' : [ UserComboOption, 'Compiler warning level to use.', [ '1', '2', '3' ], '1'],
'layout' : [ UserComboOption, 'Build directory layout.', ['mirror', 'flat' ], 'mirror' ],
'default_library' : [ UserComboOption, 'Default library type.', [ 'shared', 'static' ], 'shared' ],
- 'backend' : [ UserComboOption, 'Backend to use.', [ 'ninja', 'vs2010', 'xcode' ], 'ninja' ],
+ 'backend' : [ UserComboOption, 'Backend to use.', backendlist, 'ninja' ],
'stdsplit' : [ UserBooleanOption, 'Split stdout and stderr in test logs.', True ],
'errorlogs' : [ UserBooleanOption, "Whether to print the logs from failing tests.", False ],
}