Renamed language name from c++ to cxx to make things easier.

pull/15/head
Jussi Pakkanen 12 years ago
parent b3074e49eb
commit 775b680826
  1. 2
      interpreter.py
  2. 2
      test cases/14 cxx pch/builder.txt
  3. 2
      test cases/15 mixed pch/builder.txt
  4. 2
      test cases/2 cxx/builder.txt
  5. 4
      test cases/23 global arg/builder.txt
  6. 4
      test cases/24 target arg/builder.txt
  7. 2
      test cases/7 mixed/builder.txt

@ -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)

@ -1,3 +1,3 @@
project('c++ pch test', 'c++')
project('c++ pch test', 'cxx')
exe = executable('prog', 'prog.cc')
exe.pch('pch/prog.hh')

@ -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')

@ -1,3 +1,3 @@
project('c++ test', 'c++')
project('c++ test', 'cxx')
exe = executable('trivialprog', 'trivial.cc')
add_test('runtest', exe)

@ -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')

@ -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)

@ -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)

Loading…
Cancel
Save