aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-01-26 13:26:00 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2013-01-26 13:26:00 +0200
commitf0cec5bd79e31d9a9802c6af32324d15cb7c290c (patch)
tree07acf6ce6a8078851d952fd388c54185f442e54e
parentb97f43b9b7777a83dd44b4a16b65aeafda996aba (diff)
downloadmeson-f0cec5bd79e31d9a9802c6af32324d15cb7c290c.zip
meson-f0cec5bd79e31d9a9802c6af32324d15cb7c290c.tar.gz
meson-f0cec5bd79e31d9a9802c6af32324d15cb7c290c.tar.bz2
Check for argument leagake over languages.
-rw-r--r--test cases/23 global arg/builder.txt4
-rw-r--r--test cases/23 global arg/prog.c4
-rw-r--r--test cases/23 global arg/prog.cc8
3 files changed, 13 insertions, 3 deletions
diff --git a/test cases/23 global arg/builder.txt b/test cases/23 global arg/builder.txt
index a768864..9941a0b 100644
--- a/test cases/23 global arg/builder.txt
+++ b/test cases/23 global arg/builder.txt
@@ -1,7 +1,7 @@
project('global arg test', 'c++', 'c')
-add_global_arguments('c', '-Werror', '-DMYTHING')
-add_global_arguments('c++', '-Werror', '-std=c++11')
+add_global_arguments('c', '-DMYTHING')
+add_global_arguments('c++', '-DMYCXXTHING')
exe1 = executable('prog', 'prog.c')
exe2 = executable('prog2', 'prog.cc')
diff --git a/test cases/23 global arg/prog.c b/test cases/23 global arg/prog.c
index 5992d15..2db6212 100644
--- a/test cases/23 global arg/prog.c
+++ b/test cases/23 global arg/prog.c
@@ -2,6 +2,10 @@
#error "Global argument not set"
#endif
+#ifdef MYCXXTHING
+#error "Wrong global argument set"
+#endif
+
int main(int argc, char **argv) {
return 0;
}
diff --git a/test cases/23 global arg/prog.cc b/test cases/23 global arg/prog.cc
index fb9590e..b881645 100644
--- a/test cases/23 global arg/prog.cc
+++ b/test cases/23 global arg/prog.cc
@@ -1,4 +1,10 @@
-#include<unordered_map>
+#ifdef MYTHING
+#error "Wrong global argument set"
+#endif
+
+#ifndef MYCXXTHING
+#error "Global argument not set"
+#endif
int main(int argc, char **argv) {
return 0;