widelands-dev team mailing list archive

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

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

Commit message:
Please ubuntu 19.10.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1825811 in widelands: "Widelands won't build on Ubuntu Eoan"
  https://bugs.launchpad.net/widelands/+bug/1825811

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1825811-ubuntu-eoan/+merge/366350
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1825811-ubuntu-eoan into lp:widelands.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2018-12-13 21:27:09 +0000
+++ CMakeLists.txt	2019-04-22 10:14:58 +0000
@@ -26,7 +26,8 @@
     distro_name (DISTRO_NAME)
     # DISTRO_NAME is different on the build-servers.
     if ((DISTRO_NAME MATCHES "Ubuntu 18.10" OR DISTRO_NAME MATCHES "Cosmic"
-         OR DISTRO_NAME MATCHES "Ubuntu 19.04" OR DISTRO_NAME MATCHES "Disco")
+         OR DISTRO_NAME MATCHES "Ubuntu 19.04" OR DISTRO_NAME MATCHES "Disco"
+         OR DISTRO_NAME MATCHES "Ubuntu 19.10" OR DISTRO_NAME MATCHES "Eoan")
         AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
       cmake_policy(SET CMP0072 OLD)
     endif()