[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libstreamanalyzer] cmake: Extend regexp to allow compilation with GCC 6
From:       Jos van den Oever <jos () vandenoever ! info>
Date:       2016-05-14 20:21:54
Message-ID: E1b1g4Q-00042g-KU () scm ! kde ! org
[Download RAW message or body]

Git commit d069d1c7816990a1e550c12c3115c13353332d00 by Jos van den Oever.
Committed on 14/05/2016 at 20:21.
Pushed by vandenoever into branch 'master'.

Extend regexp to allow compilation with GCC 6

M  +1    -1    cmake/MacroCheckGccVisibility.cmake

http://commits.kde.org/libstreamanalyzer/d069d1c7816990a1e550c12c3115c13353=
332d00

diff --git a/cmake/MacroCheckGccVisibility.cmake b/cmake/MacroCheckGccVisib=
ility.cmake
index 4e78d12..88027eb 100644
--- a/cmake/MacroCheckGccVisibility.cmake
+++ b/cmake/MacroCheckGccVisibility.cmake
@@ -15,7 +15,7 @@ macro(MACRO_CHECK_GCC_VISIBILITY GccVisibility)
    # get the gcc version
    exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --versio=
n OUTPUT_VARIABLE _gcc_version_info)
 =

-   string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_versio=
n_info}")
+   string (REGEX MATCH "[3456]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_versi=
on_info}")
    # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the pat=
ch level, handle this here:
    if (NOT _gcc_version)
       string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc=
_version "${_gcc_version_info}")
[prev in list] [next in list] [prev in thread] [next in thread]