提交: 54a8436cdccb49c8ffe6c65c7eb955b1967e6df8 - zandronum-cluster (hg)

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG), Euroboros (EB), and Down Under Doomers (DUD).

Commit MetaInfo

• 修订版: 54a8436cdccb49c8ffe6c65c7eb955b1967e6df8 (tree)
• 时间: 2020-11-16 05:31:10
• 作者: DoomJoshuaBoy
• Commiter: DoomJoshuaBoy

Log Message

Fixed GME compile issue for GCC 10 or later

更改概述

• modified: game-music-emu/CMakeLists.txt

差异

diff -r 7a4a87002864 -r 54a8436cdccb game-music-emu/CMakeLists.txt
--- a/game-music-emu/CMakeLists.txt	Sun Nov 15 08:33:28 2020 -0500
+++ b/game-music-emu/CMakeLists.txt	Mon Nov 16 07:31:10 2020 +1100
@@ -83,8 +83,9 @@
    set (ENABLE_VISIBILITY OFF)
    if (__LIBGME_TEST_VISIBILITY)
       # get the gcc version
+      # [JS] This fixes the issue for GCC 10 or later
       exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
-      string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+      string (REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" _gcc_version "${_gcc_version_info}") 
 
       # gcc <4.1 had poor support for symbol visibility
       if ((${_gcc_version} VERSION_GREATER "4.1") OR (${_gcc_version} VERSION_EQUAL "4.1"))