widelands-dev team mailing list archive

[Toni Förster <toni.foerster@xxxxxxxxx>]

Toni Förster has proposed merging lp:~widelands-dev/widelands/ubuntu-disco into lp:widelands.

Commit message:
Disable CMP0072 for Ubuntu 19.04

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/ubuntu-disco/+merge/359547

Problem with GLVND persists on Ubuntu 19.04
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ubuntu-disco into lp:widelands.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2018-11-13 15:19:18 +0000
+++ CMakeLists.txt	2018-11-26 17:24:40 +0000
@@ -25,7 +25,8 @@
   if (CMAKE_SYSTEM MATCHES "Linux")
     distro_name (DISTRO_NAME)
     # DISTRO_NAME is different on the build-servers.
-    if ((DISTRO_NAME MATCHES "Ubuntu 18.10" OR DISTRO_NAME MATCHES "Cosmic")
+    if ((DISTRO_NAME MATCHES "Ubuntu 18.10" OR DISTRO_NAME MATCHES "Cosmic"
+         OR DISTRO_NAME MATCHES "Ubuntu 19.04" OR DISTRO_NAME MATCHES "disco")
         AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
       cmake_policy(SET CMP0072 OLD)
     endif()