widelands

Merge lp:~widelands-dev/widelands/ubuntu-disco into lp:widelands

  1. ubuntu-disco
  2. Merge into trunk
Proposed by Toni Förster
Status: Merged
Merged at revision: 8940
Proposed branch: lp:~widelands-dev/widelands/ubuntu-disco
Merge into: lp:widelands
Diff against target: 13 lines (+2/-1)
1 file modified
CMakeLists.txt (+2/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/ubuntu-disco
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+359547@code.launchpad.net

Commit message

Disable CMP0072 for Ubuntu 19.04

Description of the change

Problem with GLVND persists on Ubuntu 19.04

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4298. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/459871293.
Appveyor build 4091. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ubuntu_disco-4091.

Revision history for this message
GunChleoc (gunchleoc) wrote :

We should have disco -> Disco for consistency?

LGTM otherwise :)

Revision history for this message
Toni Förster (stonerl) wrote :

It reports the name with a lowercase d. According to this log:

https://launchpadlibrarian.net/399412545/buildlog_ubuntu-disco-i386.widelands_1%3A19-ppa0-bzr8937-201811281247~ubuntu19.04.1_BUILDING.txt.gz

Package: widelands
Version: 1:19-ppa0-bzr8937-201811281247~ubuntu19.04.1
Source Version: 1:19-ppa0-bzr8937-201811281247~ubuntu19.04.1
Distribution: disco
Machine Architecture: amd64
Host Architecture: i386
Build Architecture: i386

Revision history for this message
GunChleoc (gunchleoc) wrote :

OK, so it's an upstream bug then... let's have it! Thanks for fixing :)

@bunnybot merge

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2018-11-13 15:19:18 +0000
3+++ CMakeLists.txt 2018-11-26 17:24:40 +0000
4@@ -25,7 +25,8 @@
5 if (CMAKE_SYSTEM MATCHES "Linux")
6 distro_name (DISTRO_NAME)
7 # DISTRO_NAME is different on the build-servers.
8- if ((DISTRO_NAME MATCHES "Ubuntu 18.10" OR DISTRO_NAME MATCHES "Cosmic")
9+ if ((DISTRO_NAME MATCHES "Ubuntu 18.10" OR DISTRO_NAME MATCHES "Cosmic"
10+ OR DISTRO_NAME MATCHES "Ubuntu 19.04" OR DISTRO_NAME MATCHES "disco")
11 AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
12 cmake_policy(SET CMP0072 OLD)
13 endif()

Subscribers

People subscribed via source and target branches

to status/vote changes: