Skip to content
Snippets Groups Projects
Commit 7cf6ae4b authored by Simon McVittie's avatar Simon McVittie
Browse files

Select the same C and C++ language as steam-runtime-tools


We need this if we're using the steam-runtime-tools subproject with a
compiler from the distant past, like the one in Steam Runtime 1 'scout'.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 86cce64c
No related branches found
No related tags found
No related merge requests found
......@@ -5,6 +5,7 @@ Maintainer: Simon McVittie <smcv@collabora.com>
Standards-Version: 4.4.0
Build-Depends:
debhelper (>= 9),
g++ (>= 4:4.8) | g++-4.8,
libglib2.0-dev,
libsteam-runtime-tools-0-dev (>= 0.20190926.0~),
libxau-dev,
......
......@@ -131,6 +131,9 @@ build:scout:
${NULL+}
fi
# g++ 4.6 is too old for the submodule (see also debian/rules)
export CXX=g++-4.8
meson \
--prefix="$(pwd)/_build/prefix" \
-Dsrcdir=src \
......
......@@ -7,6 +7,10 @@ export LC_ALL=C.UTF-8
include /usr/share/dpkg/default.mk
ifeq ($(shell dpkg --compare-versions `c++ -dumpversion || echo 0` ge 4.8 || echo old),old)
export CXX = g++-4.8
endif
meson_options =
ifeq ($(DEB_DISTRIBUTION),UNRELEASED)
......
......@@ -24,6 +24,8 @@
project(
'pressure-vessel', 'c',
default_options: [
'c_std=c99',
'cpp_std=c++11',
'warning_level=2',
],
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment