Merge lp:~stonerl/widelands/cmake_18_10_test into lp:widelands

[Toni Förster]

changed comment in CMakeLists regarding GCC

like this?

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4155. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/443812705.
Appveyor build 3952. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_stonerl_widelands_cmake_18_10_test-3952.

[GunChleoc (gunchleoc)]

+1

@bunnybot merge

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2018-10-17 15:04:13 +0000
+++ CMakeLists.txt	2018-10-19 16:44:02 +0000
@@ -20,12 +20,11 @@
 if(POLICY CMP0072)
   cmake_policy(SET CMP0072 NEW)
 
-  # On Ubuntu 18.10 we need to set this policy to OLD when GCC is used.
-  # Also the DISTRO_NAME is different on the build-servers.
-  #TODO(stonerl): Check on later Ubuntu releases whether this workaround is
+  # TODO(stonerl): Check on later Ubuntu releases whether this workaround is
   # still needed or not.
   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")
         AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
       cmake_policy(SET CMP0072 OLD)