aboutsummaryrefslogtreecommitdiff
path: root/test cases/frameworks
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-06-02 22:31:10 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2013-06-02 22:31:10 +0300
commit89aa4e2233f9583501a172cea46e5d421681d274 (patch)
tree4f436353c02d63a50dce6a5acf64cdabdd80f50d /test cases/frameworks
parent8364bfcc6df6d41c34c5963f707b3cedf5a7e0cb (diff)
downloadmeson-89aa4e2233f9583501a172cea46e5d421681d274.zip
meson-89aa4e2233f9583501a172cea46e5d421681d274.tar.gz
meson-89aa4e2233f9583501a172cea46e5d421681d274.tar.bz2
C++ is now called cpp rather than cxx.
Diffstat (limited to 'test cases/frameworks')
-rw-r--r--test cases/frameworks/1 boost/meson.build2
-rw-r--r--test cases/frameworks/2 gtest/meson.build2
-rw-r--r--test cases/frameworks/3 gmock/meson.build2
-rw-r--r--test cases/frameworks/4 qt5/meson.build2
-rw-r--r--test cases/frameworks/5 protocol buffers/meson.build2
5 files changed, 5 insertions, 5 deletions
diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build
index 74bdd98..033cb22 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 ac6214a..b1a7563 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 53d3b36..37867c9 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 6c5bff6..a630d73 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 4ab961c..1e52e48 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')