aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-07-25 23:20:37 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2015-07-25 23:20:37 +0300
commit5788f47952dd92095fc824a494c5c2c6e1c1209c (patch)
tree8a71f69cebe7fe4d4eb470ab2cd7978d7ebd0d71
parentfa74ef4c5785453ebdd1aaa1380aa7a632336c5b (diff)
downloadmeson-5788f47952dd92095fc824a494c5c2c6e1c1209c.zip
meson-5788f47952dd92095fc824a494c5c2c6e1c1209c.tar.gz
meson-5788f47952dd92095fc824a494c5c2c6e1c1209c.tar.bz2
Added (or, rather, brought back) the add_languages function.
-rw-r--r--interpreter.py6
-rw-r--r--test cases/common/89 add language/meson.build7
-rw-r--r--test cases/common/89 add language/prog.c6
-rw-r--r--test cases/common/89 add language/prog.cc6
4 files changed, 25 insertions, 0 deletions
diff --git a/interpreter.py b/interpreter.py
index ebfca1a..de3b199 100644
--- a/interpreter.py
+++ b/interpreter.py
@@ -832,6 +832,7 @@ class Interpreter():
'configure_file' : self.func_configure_file,
'include_directories' : self.func_include_directories,
'add_global_arguments' : self.func_add_global_arguments,
+ 'add_languages' : self.func_add_languages,
'find_program' : self.func_find_program,
'find_library' : self.func_find_library,
'configuration_data' : self.func_configuration_data,
@@ -1175,6 +1176,11 @@ class Interpreter():
raise InterpreterException('Compiling Vala requires a C compiler')
@noKwargs
+ @stringArgs
+ def func_add_languages(self, node, args, kwargs):
+ self.add_languages(node, args)
+
+ @noKwargs
def func_message(self, node, args, kwargs):
# reduce arguments again to avoid flattening posargs
(posargs, kwargs) = self.reduce_arguments(node.args)
diff --git a/test cases/common/89 add language/meson.build b/test cases/common/89 add language/meson.build
new file mode 100644
index 0000000..339fe22
--- /dev/null
+++ b/test cases/common/89 add language/meson.build
@@ -0,0 +1,7 @@
+project('add language', 'c')
+
+test('C', executable('cprog', 'prog.c'))
+
+add_languages('cpp')
+
+test('C++', executable('cppprog', 'prog.cc'))
diff --git a/test cases/common/89 add language/prog.c b/test cases/common/89 add language/prog.c
new file mode 100644
index 0000000..9b5685f
--- /dev/null
+++ b/test cases/common/89 add language/prog.c
@@ -0,0 +1,6 @@
+#include<stdio.h>
+
+int main(int argc, char **argv) {
+ printf("I am plain C.\n");
+ return 0;
+}
diff --git a/test cases/common/89 add language/prog.cc b/test cases/common/89 add language/prog.cc
new file mode 100644
index 0000000..03647dd
--- /dev/null
+++ b/test cases/common/89 add language/prog.cc
@@ -0,0 +1,6 @@
+#include<iostream>
+
+int main(int, char**) {
+ std::cout << "I am C++.\n";
+ return 0;
+}