From 4d4bc4eb696b7c12575c8f6b1b00e032b831e32c Mon Sep 17 00:00:00 2001
Message-Id: <4d4bc4eb696b7c12575c8f6b1b00e032b831e32c.1424793951.git.brad.king@kitware.com>
From: Brad King <brad.king@kitware.com>
Date: Tue, 24 Feb 2015 11:04:33 -0500
Subject: [PATCH] CMakeDetermineCompilerId: Workaround GNU 4.5.1 reporting
 4.5.0 (#15417)

Add a special case to work around GNU 4.5.1 setting __GNUC_PATCHLEVEL__
to "0".
---
 Modules/CMakeCCompilerId.c.in          | 9 +++++++++
 Modules/CMakeCXXCompilerId.cpp.in      | 9 +++++++++
 Modules/CMakeDetermineCompilerId.cmake | 9 +++++++++
 Modules/CMakeFortranCompilerId.F.in    | 7 +++++++
 4 files changed, 34 insertions(+)

diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index 09ae509..4aab5f5 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -24,6 +24,12 @@ char const* qnxnto = "INFO" ":" "qnxnto[]";
 @CMAKE_C_COMPILER_ID_PLATFORM_CONTENT@
 @CMAKE_C_COMPILER_ID_ERROR_FOR_TEST@
 
+/* Workaround for GNU versions that report __GNUC_PATCHLEVEL__ wrong.  */
+#if defined(__GNUC__) && defined(__VERSION__)
+# define INFO_VERSION_GNU
+char const* info_version_gnu = "INFO" ":" "version_gnu[" __VERSION__ "]";
+#endif
+
 /*--------------------------------------------------------------------------*/
 
 #ifdef ID_VOID_MAIN
@@ -44,6 +50,9 @@ int main(int argc, char* argv[])
 #ifdef SIMULATE_VERSION_MAJOR
   require += info_simulate_version[argc];
 #endif
+#ifdef INFO_VERSION_GNU
+  require += info_version_gnu[argc];
+#endif
   (void)argv;
   return require;
 }
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index cc3ab49..03f27d8 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -23,6 +23,12 @@ char const* qnxnto = "INFO" ":" "qnxnto[]";
 @CMAKE_CXX_COMPILER_ID_PLATFORM_CONTENT@
 @CMAKE_CXX_COMPILER_ID_ERROR_FOR_TEST@
 
+/* Workaround for GNU versions that report __GNUC_PATCHLEVEL__ wrong.  */
+#if defined(__GNUC__) && defined(__VERSION__)
+# define INFO_VERSION_GNU
+char const* info_version_gnu = "INFO" ":" "version_gnu[" __VERSION__ "]";
+#endif
+
 /*--------------------------------------------------------------------------*/
 
 int main(int argc, char* argv[])
@@ -39,6 +45,9 @@ int main(int argc, char* argv[])
 #ifdef SIMULATE_VERSION_MAJOR
   require += info_simulate_version[argc];
 #endif
+#ifdef INFO_VERSION_GNU
+  require += info_version_gnu[argc];
+#endif
   (void)argv;
   return require;
 }
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index d22a867..39f28af 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -409,6 +409,7 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
     # Read the compiler identification string from the executable file.
     set(COMPILER_ID)
     set(COMPILER_VERSION)
+    set(COMPILER_VERSION_GNU)
     set(COMPILER_VERSION_MAJOR 0)
     set(COMPILER_VERSION_MINOR 0)
     set(COMPILER_VERSION_PATCH 0)
@@ -468,6 +469,9 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
       if("${info}" MATCHES "INFO:qnxnto\\[\\]")
         set(COMPILER_QNXNTO 1)
       endif()
+      if("${info}" MATCHES "INFO:version_gnu\\[([^]\"]*)\\]")
+        set(COMPILER_VERSION_GNU "${CMAKE_MATCH_1}")
+      endif()
     endforeach()
 
     # Construct compiler version from components if needed.
@@ -484,6 +488,11 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
       endif()
     endif()
 
+    # Work around GNU 4.5.1 reporting 4.5.0 in preprocessor macros.
+    if(COMPILER_VERSION STREQUAL "4.5.0" AND COMPILER_VERSION_GNU MATCHES "4.5.1")
+      set(COMPILER_VERSION "4.5.1")
+    endif()
+
     # Detect the exact architecture from the PE header.
     if(WIN32)
       # The offset to the PE signature is stored at 0x3c.
diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 2533d3f..c6e5d6b 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -198,4 +198,11 @@
 #define HEX_1(n) ((n)     & 0xF)
 @CMAKE_Fortran_COMPILER_ID_VERSION_INFO@
 
+#if 0
+! Workaround for GNU versions that report __GNUC_PATCHLEVEL__ wrong.
+#endif
+#if defined(__GNUC__) && defined(__VERSION__)
+        PRINT *, "INFO:version_gnu[", __VERSION__, "]"
+#endif
+
       END
-- 
2.1.4

--- a/share/cmake-2.8/Modules/CMakeCCompilerId.c.in
+++ b/share/cmake-2.8/Modules/CMakeCCompilerId.c.in
@@ -184,6 +184,12 @@
 
 @CMAKE_C_COMPILER_ID_PLATFORM_CONTENT@
 
+/* Workaround for GNU versions that report __GNUC_PATCHLEVEL__ wrong.  */
+#if defined(__GNUC__) && defined(__VERSION__)
+# define INFO_VERSION_GNU
+char const* info_version_gnu = "INFO" ":" "version_gnu[" __VERSION__ "]";
+#endif
+
 /*--------------------------------------------------------------------------*/
 
 #ifdef ID_VOID_MAIN
@@ -198,6 +204,9 @@
 #ifdef COMPILER_VERSION_MAJOR
   require += info_version[argc];
 #endif
+#ifdef INFO_VERSION_GNU
+  require += info_version_gnu[argc];
+#endif
   (void)argv;
   return require;
 }
--- a/share/cmake-2.8/Modules/CMakeCXXCompilerId.cpp.in
+++ b/share/cmake-2.8/Modules/CMakeCXXCompilerId.cpp.in
@@ -172,6 +172,12 @@
 
 @CMAKE_CXX_COMPILER_ID_PLATFORM_CONTENT@
 
+/* Workaround for GNU versions that report __GNUC_PATCHLEVEL__ wrong.  */
+#if defined(__GNUC__) && defined(__VERSION__)
+# define INFO_VERSION_GNU
+char const* info_version_gnu = "INFO" ":" "version_gnu[" __VERSION__ "]";
+#endif
+
 /*--------------------------------------------------------------------------*/
 
 int main(int argc, char* argv[])
@@ -182,6 +188,9 @@
 #ifdef COMPILER_VERSION_MAJOR
   require += info_version[argc];
 #endif
+#ifdef INFO_VERSION_GNU
+  require += info_version_gnu[argc];
+#endif
   (void)argv;
   return require;
 }
--- a/share/cmake-2.8/Modules/CMakeDetermineCompilerId.cmake
+++ b/share/cmake-2.8/Modules/CMakeDetermineCompilerId.cmake
@@ -184,9 +184,10 @@
     # Read the compiler identification string from the executable file.
     SET(COMPILER_ID)
     SET(COMPILER_VERSION)
+    SET(COMPILER_VERSION_GNU)
     SET(PLATFORM_ID)
     FILE(STRINGS ${file}
-      CMAKE_${lang}_COMPILER_ID_STRINGS LIMIT_COUNT 4 REGEX "INFO:")
+      CMAKE_${lang}_COMPILER_ID_STRINGS LIMIT_COUNT 5 REGEX "INFO:")
     SET(HAVE_COMPILER_TWICE 0)
     FOREACH(info ${CMAKE_${lang}_COMPILER_ID_STRINGS})
       IF("${info}" MATCHES ".*INFO:compiler\\[([^]\"]*)\\].*")
@@ -209,8 +210,16 @@
         STRING(REGEX REPLACE "^0+([0-9])" "\\1" COMPILER_VERSION "${COMPILER_VERSION}")
         STRING(REGEX REPLACE "\\.0+([0-9])" ".\\1" COMPILER_VERSION "${COMPILER_VERSION}")
       ENDIF("${info}" MATCHES ".*INFO:compiler_version\\[([^]\"]*)\\].*")
+      IF("${info}" MATCHES ".*INFO:version_gnu\\[([^]\"]*)\\].*")
+        STRING(REGEX REPLACE ".*INFO:version_gnu\\[([^]\"]*)\\].*" "\\1" COMPILER_VERSION_GNU "${info}")
+      ENDIF("${info}" MATCHES ".*INFO:version_gnu\\[([^]\"]*)\\].*")
     ENDFOREACH(info)
 
+    # Work around GNU 4.5.1 reporting 4.5.0 in preprocessor macros.
+    IF(COMPILER_VERSION STREQUAL "4.5.0" AND COMPILER_VERSION_GNU MATCHES "4.5.1")
+      SET(COMPILER_VERSION "4.5.1")
+    ENDIF(COMPILER_VERSION STREQUAL "4.5.0" AND COMPILER_VERSION_GNU MATCHES "4.5.1")
+
     # Check if a valid compiler and platform were found.
     IF(COMPILER_ID AND NOT COMPILER_ID_TWICE)
       SET(CMAKE_${lang}_COMPILER_ID "${COMPILER_ID}")
--- a/share/cmake-2.8/Modules/CMakeFortranCompilerId.F.in
+++ b/share/cmake-2.8/Modules/CMakeFortranCompilerId.F.in
@@ -1,5 +1,13 @@
       PROGRAM CMakeFortranCompilerId
 #if 0
+! Workaround for GNU versions that report __GNUC_PATCHLEVEL__ wrong.
+#endif
+#if defined(__GNUC__) && defined(__VERSION__)
+# define INFO_VERSION_GNU
+        CHARACTER(LEN=50) :: VGNU
+        VGNU = __VERSION__
+#endif
+#if 0
 ! Identify the compiler
 #endif
 #if defined(__INTEL_COMPILER) || defined(__ICC)
@@ -120,4 +128,7 @@
         PRINT *, 'INFO:arch[X86]'
 # endif
 #endif
+#ifdef INFO_VERSION_GNU
+        PRINT *, "INFO:version_gnu[", VGNU, "]"
+#endif
       END

--- a/share/cmake-2.8/Modules/CMakeCCompilerId.c.in
+++ b/share/cmake-2.8/Modules/CMakeCCompilerId.c.in
@@ -209,6 +209,12 @@
 
 @CMAKE_C_COMPILER_ID_PLATFORM_CONTENT@
 
+/* Workaround for GNU versions that report __GNUC_PATCHLEVEL__ wrong.  */
+#if defined(__GNUC__) && defined(__VERSION__)
+# define INFO_VERSION_GNU
+char const* info_version_gnu = "INFO" ":" "version_gnu[" __VERSION__ "]";
+#endif
+
 /*--------------------------------------------------------------------------*/
 
 #ifdef ID_VOID_MAIN
@@ -223,6 +229,9 @@
 #ifdef COMPILER_VERSION_MAJOR
   require += info_version[argc];
 #endif
+#ifdef INFO_VERSION_GNU
+  require += info_version_gnu[argc];
+#endif
   (void)argv;
   return require;
 }
--- a/share/cmake-2.8/Modules/CMakeCXXCompilerId.cpp.in
+++ b/share/cmake-2.8/Modules/CMakeCXXCompilerId.cpp.in
@@ -202,6 +202,12 @@
 
 @CMAKE_CXX_COMPILER_ID_PLATFORM_CONTENT@
 
+/* Workaround for GNU versions that report __GNUC_PATCHLEVEL__ wrong.  */
+#if defined(__GNUC__) && defined(__VERSION__)
+# define INFO_VERSION_GNU
+char const* info_version_gnu = "INFO" ":" "version_gnu[" __VERSION__ "]";
+#endif
+
 /*--------------------------------------------------------------------------*/
 
 int main(int argc, char* argv[])
@@ -212,6 +218,9 @@
 #ifdef COMPILER_VERSION_MAJOR
   require += info_version[argc];
 #endif
+#ifdef INFO_VERSION_GNU
+  require += info_version_gnu[argc];
+#endif
   (void)argv;
   return require;
 }
--- a/share/cmake-2.8/Modules/CMakeDetermineCompilerId.cmake
+++ b/share/cmake-2.8/Modules/CMakeDetermineCompilerId.cmake
@@ -307,9 +307,10 @@
     # Read the compiler identification string from the executable file.
     set(COMPILER_ID)
     set(COMPILER_VERSION)
+    set(COMPILER_VERSION_GNU)
     set(PLATFORM_ID)
     file(STRINGS ${file}
-      CMAKE_${lang}_COMPILER_ID_STRINGS LIMIT_COUNT 4 REGEX "INFO:")
+      CMAKE_${lang}_COMPILER_ID_STRINGS LIMIT_COUNT 5 REGEX "INFO:")
     set(HAVE_COMPILER_TWICE 0)
     foreach(info ${CMAKE_${lang}_COMPILER_ID_STRINGS})
       if("${info}" MATCHES ".*INFO:compiler\\[([^]\"]*)\\].*")
@@ -332,8 +333,16 @@
         string(REGEX REPLACE "^0+([0-9])" "\\1" COMPILER_VERSION "${COMPILER_VERSION}")
         string(REGEX REPLACE "\\.0+([0-9])" ".\\1" COMPILER_VERSION "${COMPILER_VERSION}")
       endif()
+      if("${info}" MATCHES ".*INFO:version_gnu\\[([^]\"]*)\\].*")
+        string(REGEX REPLACE ".*INFO:version_gnu\\[([^]\"]*)\\].*" "\\1" COMPILER_VERSION_GNU "${info}")
+      endif()
     endforeach()
 
+    # Work around GNU 4.5.1 reporting 4.5.0 in preprocessor macros.
+    if(COMPILER_VERSION STREQUAL "4.5.0" AND COMPILER_VERSION_GNU MATCHES "4.5.1")
+      set(COMPILER_VERSION "4.5.1")
+    endif()
+
     # Detect the exact architecture from the PE header.
     if(WIN32)
       # The offset to the PE signature is stored at 0x3c.
--- a/share/cmake-2.8/Modules/CMakeFortranCompilerId.F.in
+++ b/share/cmake-2.8/Modules/CMakeFortranCompilerId.F.in
@@ -1,5 +1,13 @@
       PROGRAM CMakeFortranCompilerId
 #if 0
+! Workaround for GNU versions that report __GNUC_PATCHLEVEL__ wrong.
+#endif
+#if defined(__GNUC__) && defined(__VERSION__)
+# define INFO_VERSION_GNU
+        CHARACTER(LEN=50) :: VGNU
+        VGNU = __VERSION__
+#endif
+#if 0
 ! Identify the compiler
 #endif
 #if defined(__INTEL_COMPILER) || defined(__ICC)
@@ -116,4 +124,7 @@
         PRINT *, 'INFO:arch[X86]'
 # endif
 #endif
+#ifdef INFO_VERSION_GNU
+        PRINT *, "INFO:version_gnu[", VGNU, "]"
+#endif
       END

--- a/share/cmake-3.1/Modules/CMakeCCompilerId.c.in
+++ b/share/cmake-3.1/Modules/CMakeCCompilerId.c.in
@@ -24,6 +24,12 @@
 @CMAKE_C_COMPILER_ID_PLATFORM_CONTENT@
 @CMAKE_C_COMPILER_ID_ERROR_FOR_TEST@
 
+/* Workaround for GNU versions that report __GNUC_PATCHLEVEL__ wrong.  */
+#if defined(__GNUC__) && defined(__VERSION__)
+# define INFO_VERSION_GNU
+char const* info_version_gnu = "INFO" ":" "version_gnu[" __VERSION__ "]";
+#endif
+
 /*--------------------------------------------------------------------------*/
 
 #ifdef ID_VOID_MAIN
@@ -44,6 +50,9 @@
 #ifdef SIMULATE_VERSION_MAJOR
   require += info_simulate_version[argc];
 #endif
+#ifdef INFO_VERSION_GNU
+  require += info_version_gnu[argc];
+#endif
   (void)argv;
   return require;
 }
--- a/share/cmake-3.1/Modules/CMakeCXXCompilerId.cpp.in
+++ b/share/cmake-3.1/Modules/CMakeCXXCompilerId.cpp.in
@@ -23,6 +23,12 @@
 @CMAKE_CXX_COMPILER_ID_PLATFORM_CONTENT@
 @CMAKE_CXX_COMPILER_ID_ERROR_FOR_TEST@
 
+/* Workaround for GNU versions that report __GNUC_PATCHLEVEL__ wrong.  */
+#if defined(__GNUC__) && defined(__VERSION__)
+# define INFO_VERSION_GNU
+char const* info_version_gnu = "INFO" ":" "version_gnu[" __VERSION__ "]";
+#endif
+
 /*--------------------------------------------------------------------------*/
 
 int main(int argc, char* argv[])
@@ -39,6 +45,9 @@
 #ifdef SIMULATE_VERSION_MAJOR
   require += info_simulate_version[argc];
 #endif
+#ifdef INFO_VERSION_GNU
+  require += info_version_gnu[argc];
+#endif
   (void)argv;
   return require;
 }
--- a/share/cmake-3.1/Modules/CMakeDetermineCompilerId.cmake
+++ b/share/cmake-3.1/Modules/CMakeDetermineCompilerId.cmake
@@ -414,12 +414,13 @@
     # Read the compiler identification string from the executable file.
     set(COMPILER_ID)
     set(COMPILER_VERSION)
+    set(COMPILER_VERSION_GNU)
     set(PLATFORM_ID)
     set(ARCHITECTURE_ID)
     set(SIMULATE_ID)
     set(SIMULATE_VERSION)
     file(STRINGS ${file}
-      CMAKE_${lang}_COMPILER_ID_STRINGS LIMIT_COUNT 6 REGEX "INFO:[A-Za-z0-9_]+\\[[^]]*\\]")
+      CMAKE_${lang}_COMPILER_ID_STRINGS LIMIT_COUNT 8 REGEX "INFO:[A-Za-z0-9_]+\\[[^]]*\\]")
     set(COMPILER_ID_TWICE)
     foreach(info ${CMAKE_${lang}_COMPILER_ID_STRINGS})
       if("${info}" MATCHES "INFO:compiler\\[([^]\"]*)\\]")
@@ -448,8 +449,16 @@
       if("${info}" MATCHES "INFO:qnxnto")
         set(COMPILER_QNXNTO 1)
       endif()
+      if("${info}" MATCHES "INFO:version_gnu\\[([^]\"]*)\\]")
+        set(COMPILER_VERSION_GNU "${CMAKE_MATCH_1}")
+      endif()
     endforeach()
 
+    # Work around GNU 4.5.1 reporting 4.5.0 in preprocessor macros.
+    if(COMPILER_VERSION STREQUAL "4.5.0" AND COMPILER_VERSION_GNU MATCHES "4.5.1")
+      set(COMPILER_VERSION "4.5.1")
+    endif()
+
     # Detect the exact architecture from the PE header.
     if(WIN32)
       # The offset to the PE signature is stored at 0x3c.
--- a/share/cmake-3.1/Modules/CMakeFortranCompilerId.F.in
+++ b/share/cmake-3.1/Modules/CMakeFortranCompilerId.F.in
@@ -1,5 +1,13 @@
       PROGRAM CMakeFortranCompilerId
 #if 0
+! Workaround for GNU versions that report __GNUC_PATCHLEVEL__ wrong.
+#endif
+#if defined(__GNUC__) && defined(__VERSION__)
+# define INFO_VERSION_GNU
+        CHARACTER(LEN=50) :: VGNU
+        VGNU = __VERSION__
+#endif
+#if 0
 ! Identify the compiler
 #endif
 #if defined(__INTEL_COMPILER) || defined(__ICC)
@@ -134,4 +142,7 @@
         PRINT *, 'INFO:arch[X86]'
 # endif
 #endif
+#ifdef INFO_VERSION_GNU
+        PRINT *, "INFO:version_gnu[", VGNU, "]"
+#endif
       END