Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Christian Butz
VTK
Commits
77bd9900
Commit
77bd9900
authored
Feb 02, 2016
by
Orion Poplawski
Committed by
Robert Maynard
Jul 06, 2016
Browse files
Support gcc versions up to 9.X
parent
7b7175dd
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMake/VTKGenerateExportHeader.cmake
View file @
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
"[3
456
]
\\
.[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:
...
...
CMake/vtkCompilerExtras.cmake
View file @
77bd9900
...
...
@@ -32,7 +32,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
OUTPUT_VARIABLE _gcc_version_info
ERROR_VARIABLE _gcc_version_info
)
string
(
REGEX MATCH
"[3
456
]
\\
.[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"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment