projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a246aa2
)
Also build tests on Ubuntu 22.04.
author
Carl Hetherington
<cth@carlh.net>
Sat, 15 Oct 2022 00:21:25 +0000
(
02:21
+0200)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 15 Oct 2022 00:21:25 +0000
(
02:21
+0200)
cscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 4659ce285a4e19bc818158eddba22f87ac0f7115..1c62f33820e7deb4f3a29ec980765192449a4f10 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-467,11
+467,11
@@
def configure_options(target, options, for_package=False):
opt = ' --warnings-are-errors'
if for_package or not (
opt = ' --warnings-are-errors'
if for_package or not (
- (target.platform == 'linux' and target.distro == 'ubuntu' and target.version
== '18.04'
) or
+ (target.platform == 'linux' and target.distro == 'ubuntu' and target.version
in ['18.04', '22.04']
) or
(target.platform == 'osx') or
(target.platform == 'windows')
):
(target.platform == 'osx') or
(target.platform == 'windows')
):
- # Currently we only build tests on
Ubuntu 18.04, macOS and Window
s
+ # Currently we only build tests on
macOS, Windows, and some Ubuntu version
s
opt += ' --disable-tests'
if target.debug:
opt += ' --disable-tests'
if target.debug: