diff options
Diffstat (limited to 'gcc6.patch')
-rw-r--r-- | gcc6.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/gcc6.patch b/gcc6.patch new file mode 100644 index 000000000000..f4f03c0a66a8 --- /dev/null +++ b/gcc6.patch @@ -0,0 +1,32 @@ +--- a/CMake/vtkCompilerExtras.cmake 2014-01-22 16:55:41.000000000 +0100 ++++ b/CMake/vtkCompilerExtras.cmake.new 2016-07-11 21:28:48.107362104 +0200 +@@ -27,10 +27,10 @@ + OUTPUT_VARIABLE _gcc_version_info + ERROR_VARIABLE _gcc_version_info) + +- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" ++ string (REGEX MATCH "[0-9]\\.[0-9]\\.[0-9]" + _gcc_version "${_gcc_version_info}") + if(NOT _gcc_version) +- string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" ++ string (REGEX REPLACE ".*\\(GCC\\).* ([0-9]\\.[0-9]) .*" "\\1.0" + _gcc_version "${_gcc_version_info}") + endif() + +--- a/CMake/GenerateExportHeader.cmake 2014-01-22 16:55:41.000000000 +0100 ++++ b/CMake/GenerateExportHeader.cmake.new 2016-07-11 21:28:47.977361853 +0200 +@@ -166,12 +166,12 @@ + execute_process(COMMAND ${CMAKE_C_COMPILER} --version + OUTPUT_VARIABLE _gcc_version_info + ERROR_VARIABLE _gcc_version_info) +- string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]" ++ string(REGEX MATCH "[0-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: + if(NOT _gcc_version) +- string(REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" ++ string(REGEX REPLACE ".*\\(GCC\\).* ([0-9]\\.[0-9]) .*" "\\1.0" + _gcc_version "${_gcc_version_info}") + endif() + |