aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2017-03-24 18:37:25 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2017-03-27 11:25:22 +0530
commitee3010e767ee3917e54fcd30144323b2fd3d05e0 (patch)
tree5f7a1da5440d0e8bb7a3642595b1290b226c30b7
parent996af2556726383449036ab0512029ead3a3f18f (diff)
downloadmeson-ee3010e767ee3917e54fcd30144323b2fd3d05e0.zip
meson-ee3010e767ee3917e54fcd30144323b2fd3d05e0.tar.gz
meson-ee3010e767ee3917e54fcd30144323b2fd3d05e0.tar.bz2
Don't require a language/compiler for configuring
Not really needed for projects that don't compile anything. Closes https://github.com/mesonbuild/meson/issues/1208
-rw-r--r--mesonbuild/interpreter.py4
-rw-r--r--test cases/common/9 header install/meson.build2
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 56e5b8f..550e2f9 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1613,6 +1613,8 @@ class Interpreter(InterpreterBase):
@stringArgs
def func_project(self, node, args, kwargs):
+ if len(args) < 1:
+ raise InvalidArguments('Not enough arguments to project(). Needs at least the project name.')
default_options = kwargs.get('default_options', [])
if self.environment.first_invocation and (len(default_options) > 0 or
len(self.default_project_options) > 0):
@@ -1625,8 +1627,6 @@ class Interpreter(InterpreterBase):
)
oi.process(self.option_file)
self.build.environment.merge_options(oi.options)
- if len(args) < 2:
- raise InvalidArguments('Not enough arguments to project(). Needs at least the project name and one language')
self.active_projectname = args[0]
self.project_version = kwargs.get('version', 'undefined')
if self.build.project_version is None:
diff --git a/test cases/common/9 header install/meson.build b/test cases/common/9 header install/meson.build
index 7f3ce51..7dfbddb 100644
--- a/test cases/common/9 header install/meson.build
+++ b/test cases/common/9 header install/meson.build
@@ -1,4 +1,4 @@
-project('header install', 'c')
+project('header install')
as_array = ['subdir.h']