Commit d7643f79 authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot
Browse files

Merge topic 'opoplawski/vtk-args'

77bd9900

 Support gcc versions up to 9.X
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !1622
parents 26be68fd 77bd9900
......@@ -174,7 +174,7 @@ macro(_vtk_test_compiler_hidden_visibility)
execute_process(COMMAND ${CMAKE_C_COMPILER} --version
OUTPUT_VARIABLE _gcc_version_info
ERROR_VARIABLE _gcc_version_info)
string(REGEX MATCH "[3456]\\.[0-9]\\.[0-9]*"
string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
_gcc_version "${_gcc_version_info}")
# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
# patch level, handle this here:
......
......@@ -32,7 +32,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
OUTPUT_VARIABLE _gcc_version_info
ERROR_VARIABLE _gcc_version_info)
string (REGEX MATCH "[3456]\\.[0-9]\\.[0-9]*"
string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
_gcc_version "${_gcc_version_info}")
if(NOT _gcc_version)
string (REGEX REPLACE ".*\\(GCC\\).*([34]\\.[0-9]).*" "\\1.0"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment