C++ is now called cpp rather than cxx.

18 files changed, 23 insertions, 23 deletions

diff --git a/test cases/common/14 cxx pch/meson.build b/test cases/common/14 cxx pch/meson.build
index 966979b16..d56800b93 100644
--- a/test cases/common/14 cxx pch/meson.build
+++ b/test cases/common/14 cxx pch/meson.build
@@ -1,2 +1,2 @@
-project('c++ pch test', 'cxx')
+project('c++ pch test', 'cpp')
 exe = executable('prog', 'prog.cc', pch : 'pch/prog.hh')
diff --git a/test cases/common/15 mixed pch/meson.build b/test cases/common/15 mixed pch/meson.build
index 74380429e..8c85672bf 100644
--- a/test cases/common/15 mixed pch/meson.build
+++ b/test cases/common/15 mixed pch/meson.build
@@ -1,4 +1,4 @@
-project('mixed C and C++ pch test', 'cxx', 'c')
+project('mixed C and C++ pch test', 'cpp', 'c')
 
 pch = ['pch/main.hh', 'pch/func.h']
 
diff --git a/test cases/common/2 cxx/meson.build b/test cases/common/2 cxx/meson.build
index 47333ba27..a2d89a389 100644
--- a/test cases/common/2 cxx/meson.build
+++ b/test cases/common/2 cxx/meson.build
@@ -1,3 +1,3 @@
-project('c++ test', 'cxx')
+project('c++ test', 'cpp')
 exe = executable('trivialprog', 'trivial.cc')
 test('runtest', exe)
diff --git a/test cases/common/23 global arg/meson.build b/test cases/common/23 global arg/meson.build
index 9d916a29c..aec5c2d80 100644
--- a/test cases/common/23 global arg/meson.build
+++ b/test cases/common/23 global arg/meson.build
@@ -1,7 +1,7 @@
-project('global arg test', 'cxx', 'c')
+project('global arg test', 'cpp', 'c')
 
 add_global_arguments('-DMYTHING', language : 'c')
-add_global_arguments('-DMYCXXTHING', language : 'cxx')
+add_global_arguments('-DMYCPPTHING', language : 'cpp')
 
 exe1 = executable('prog', 'prog.c')
 exe2 = executable('prog2', 'prog.cc')
diff --git a/test cases/common/23 global arg/prog.c b/test cases/common/23 global arg/prog.c
index 2db6212d7..df9177739 100644
--- a/test cases/common/23 global arg/prog.c
+++ b/test cases/common/23 global arg/prog.c
@@ -2,7 +2,7 @@
 #error "Global argument not set"
 #endif
 
-#ifdef MYCXXTHING
+#ifdef MYCPPTHING
 #error "Wrong global argument set"
 #endif
 
diff --git a/test cases/common/23 global arg/prog.cc b/test cases/common/23 global arg/prog.cc
index b881645d9..342fdd0cb 100644
--- a/test cases/common/23 global arg/prog.cc
+++ b/test cases/common/23 global arg/prog.cc
@@ -2,7 +2,7 @@
 #error "Wrong global argument set"
 #endif
 
-#ifndef MYCXXTHING
+#ifndef MYCPPTHING
 #error "Global argument not set"
 #endif
 
diff --git a/test cases/common/24 target arg/func.c b/test cases/common/24 target arg/func.c
index d8a509a50..9b3fe5d44 100644
--- a/test cases/common/24 target arg/func.c
+++ b/test cases/common/24 target arg/func.c
@@ -2,7 +2,7 @@
 #error "Local argument not set"
 #endif
 
-#ifdef CXXTHING
+#ifdef CPPTHING
 #error "Wrong local argument set"
 #endif
 
diff --git a/test cases/common/24 target arg/meson.build b/test cases/common/24 target arg/meson.build
index edeae4571..5aec31d8b 100644
--- a/test cases/common/24 target arg/meson.build
+++ b/test cases/common/24 target arg/meson.build
@@ -1,7 +1,7 @@
-project('local arg test', 'cxx', 'c')
+project('local arg test', 'cpp', 'c')
 
 exe1 = executable('prog', 'prog.cc', 'func.c', \
 c_args   : '-DCTHING', \
-cxx_args : '-DCXXTHING')
+cpp_args : '-DCPPTHING')
 
 test('prog1', exe1)
diff --git a/test cases/common/24 target arg/prog.cc b/test cases/common/24 target arg/prog.cc
index cc36ae079..d1893ba3f 100644
--- a/test cases/common/24 target arg/prog.cc
+++ b/test cases/common/24 target arg/prog.cc
@@ -2,7 +2,7 @@
 #error "Wrong local argument set"
 #endif
 
-#ifndef CXXTHING
+#ifndef CPPTHING
 #error "Local argument not set"
 #endif
 
diff --git a/test cases/common/7 mixed/meson.build b/test cases/common/7 mixed/meson.build
index 773155111..af88a1e4b 100644
--- a/test cases/common/7 mixed/meson.build
+++ b/test cases/common/7 mixed/meson.build
@@ -1,3 +1,3 @@
-project('mixed C and C++', 'c', 'cxx')
+project('mixed C and C++', 'c', 'cpp')
 exe = executable('prog', 'main.cc', 'func.c')
 test('mixtest', exe)
diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build
index 74bdd98b6..033cb222a 100644
--- a/test cases/frameworks/1 boost/meson.build
+++ b/test cases/frameworks/1 boost/meson.build
@@ -1,4 +1,4 @@
-project('boosttest', 'cxx')
+project('boosttest', 'cpp')
 
 # We want to have multiple separate configurations of Boost
 # within one project. The need to be independent of each other.
diff --git a/test cases/frameworks/2 gtest/meson.build b/test cases/frameworks/2 gtest/meson.build
index ac6214a07..b1a75638e 100644
--- a/test cases/frameworks/2 gtest/meson.build
+++ b/test cases/frameworks/2 gtest/meson.build
@@ -1,4 +1,4 @@
-project('gtest', 'cxx')
+project('gtest', 'cpp')
 
 gtest = dependency('gtest')
 
diff --git a/test cases/frameworks/3 gmock/meson.build b/test cases/frameworks/3 gmock/meson.build
index 53d3b3617..37867c97d 100644
--- a/test cases/frameworks/3 gmock/meson.build
+++ b/test cases/frameworks/3 gmock/meson.build
@@ -1,4 +1,4 @@
-project('gmock test', 'cxx')
+project('gmock test', 'cpp')
 
 # Using gmock without gtest is a pain so just
 # don't support that then.
diff --git a/test cases/frameworks/4 qt5/meson.build b/test cases/frameworks/4 qt5/meson.build
index 6c5bff638..a630d73ef 100644
--- a/test cases/frameworks/4 qt5/meson.build
+++ b/test cases/frameworks/4 qt5/meson.build
@@ -1,4 +1,4 @@
-project('qt5 build test', 'cxx')
+project('qt5 build test', 'cpp')
 
 qt5dep = dependency('qt5', modules : 'Widgets')
 
diff --git a/test cases/frameworks/5 protocol buffers/meson.build b/test cases/frameworks/5 protocol buffers/meson.build
index 4ab961cf8..1e52e48f1 100644
--- a/test cases/frameworks/5 protocol buffers/meson.build
+++ b/test cases/frameworks/5 protocol buffers/meson.build
@@ -1,4 +1,4 @@
-project('protocol buffer test', 'cxx')
+project('protocol buffer test', 'cpp')
 
 protoc = find_program('protoc')
 dep = dependency('protobuf')
diff --git a/test cases/objc/3 objc++/meson.build b/test cases/objc/3 objc++/meson.build
index 05589b708..7d9188471 100644
--- a/test cases/objc/3 objc++/meson.build
+++ b/test cases/objc/3 objc++/meson.build
@@ -1,4 +1,4 @@
-project('Objective C++', 'objcxx')
+project('Objective C++', 'objcpp')
 
-exe = executable('objcxxprog', 'prog.mm')
-test('objcxx', exe)
+exe = executable('objcppprog', 'prog.mm')
+test('objcpp', exe)
diff --git a/test cases/windows/3 cpp/meson.build b/test cases/windows/3 cpp/meson.build
index 2efe420fe..7b8080e54 100644
--- a/test cases/windows/3 cpp/meson.build
+++ b/test cases/windows/3 cpp/meson.build
@@ -1,4 +1,4 @@
-project('wincxx', 'cxx')
+project('wincpp', 'cpp')
 
 exe = executable('prog', 'prog.cpp')
-test('wincxx', exe)
+test('wincpp', exe)
diff --git a/test cases/windows/4 winmaincpp/meson.build b/test cases/windows/4 winmaincpp/meson.build
index 5ccd3e6a4..764448945 100644
--- a/test cases/windows/4 winmaincpp/meson.build
+++ b/test cases/windows/4 winmaincpp/meson.build
@@ -1,4 +1,4 @@
-project('winmaincpp', 'cxx')
+project('winmaincpp', 'cpp')
 
 exe = executable('prog', 'prog.cpp')
 test('winmaincpp', exe)