diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-02-09 00:06:07 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-02-09 00:06:07 +0200 |
| commit | 775b680826aa8cf4690c9719a4edb14ebc630543 (patch) | |
| tree | e8a8257c59fb77af291bfefd2af0d8b491ec9b8d | |
| parent | b3074e49ebb34396d565c0f71179ae1c84d65584 (diff) | |
| download | meson-775b680826aa8cf4690c9719a4edb14ebc630543.zip meson-775b680826aa8cf4690c9719a4edb14ebc630543.tar.gz meson-775b680826aa8cf4690c9719a4edb14ebc630543.tar.bz2 | |
Renamed language name from c++ to cxx to make things easier.
| -rwxr-xr-x | interpreter.py | 2 | ||||
| -rw-r--r-- | test cases/14 cxx pch/builder.txt | 2 | ||||
| -rw-r--r-- | test cases/15 mixed pch/builder.txt | 2 | ||||
| -rw-r--r-- | test cases/2 cxx/builder.txt | 2 | ||||
| -rw-r--r-- | test cases/23 global arg/builder.txt | 4 | ||||
| -rw-r--r-- | test cases/24 target arg/builder.txt | 4 | ||||
| -rw-r--r-- | test cases/7 mixed/builder.txt | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/interpreter.py b/interpreter.py index b749ad0..11c11f5 100755 --- a/interpreter.py +++ b/interpreter.py @@ -438,7 +438,7 @@ class Interpreter(): for lang in args: if lang.lower() == 'c': comp = self.environment.detect_c_compiler() - elif lang.lower() == 'c++': + elif lang.lower() == 'cxx': comp = self.environment.detect_cxx_compiler() else: raise InvalidCode('Tried to use unknown language "%s".' % lang) diff --git a/test cases/14 cxx pch/builder.txt b/test cases/14 cxx pch/builder.txt index 0c6396a..e79f137 100644 --- a/test cases/14 cxx pch/builder.txt +++ b/test cases/14 cxx pch/builder.txt @@ -1,3 +1,3 @@ -project('c++ pch test', 'c++') +project('c++ pch test', 'cxx') exe = executable('prog', 'prog.cc') exe.pch('pch/prog.hh') diff --git a/test cases/15 mixed pch/builder.txt b/test cases/15 mixed pch/builder.txt index c8e03f1..acf9c3b 100644 --- a/test cases/15 mixed pch/builder.txt +++ b/test cases/15 mixed pch/builder.txt @@ -1,4 +1,4 @@ -project('mixed C and C++ pch test', 'c++', 'c') +project('mixed C and C++ pch test', 'cxx', 'c') exe = executable('prog', 'main.cc', 'func.c') exe.pch('pch/main.hh', 'pch/func.h') diff --git a/test cases/2 cxx/builder.txt b/test cases/2 cxx/builder.txt index 8b5b286..0352d0d 100644 --- a/test cases/2 cxx/builder.txt +++ b/test cases/2 cxx/builder.txt @@ -1,3 +1,3 @@ -project('c++ test', 'c++') +project('c++ test', 'cxx') exe = executable('trivialprog', 'trivial.cc') add_test('runtest', exe) diff --git a/test cases/23 global arg/builder.txt b/test cases/23 global arg/builder.txt index 9941a0b..8a2b2a0 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') +project('global arg test', 'cxx', 'c') add_global_arguments('c', '-DMYTHING') -add_global_arguments('c++', '-DMYCXXTHING') +add_global_arguments('cxx', '-DMYCXXTHING') exe1 = executable('prog', 'prog.c') exe2 = executable('prog2', 'prog.cc') diff --git a/test cases/24 target arg/builder.txt b/test cases/24 target arg/builder.txt index 9c0b995..bf8abe7 100644 --- a/test cases/24 target arg/builder.txt +++ b/test cases/24 target arg/builder.txt @@ -1,8 +1,8 @@ -project('local arg test', 'c++', 'c') +project('local arg test', 'cxx', 'c') exe1 = executable('prog', 'prog.cc', 'func.c') exe1.add_compiler_args('c', '-DCTHING') -exe1.add_compiler_args('c++', '-DCXXTHING') +exe1.add_compiler_args('cxx', '-DCXXTHING') add_test('prog1', exe1) diff --git a/test cases/7 mixed/builder.txt b/test cases/7 mixed/builder.txt index 15ec234..3e32508 100644 --- a/test cases/7 mixed/builder.txt +++ b/test cases/7 mixed/builder.txt @@ -1,3 +1,3 @@ -project('mixed C and C++', 'c', 'c++') +project('mixed C and C++', 'c', 'cxx') exe = executable('prog', 'main.cc', 'func.c') add_test('mixtest', exe) |