blob: f4f03c0a66a84a7c97c768fe545d02b91f926bf6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
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()
|