[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-416-g29a45d5

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  29a45d5906f8c4d13414c659dc7f0b03eb3213b1 (commit)
       via  8f432479c6fcdf2e315a503c129a9a534c7a4c45 (commit)
      from  3d21e5a7192f03d66bfc9962ec7b7017303daea2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29a45d5906f8c4d13414c659dc7f0b03eb3213b1
commit 29a45d5906f8c4d13414c659dc7f0b03eb3213b1
Merge: 3d21e5a 8f43247
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 12:45:29 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 18 12:45:29 2015 -0500

    Merge topic 'compiler-version-Fortran' into next
    
    8f432479 fixup! Fortran: Add infrastructure to detect compiler version


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f432479c6fcdf2e315a503c129a9a534c7a4c45
commit 8f432479c6fcdf2e315a503c129a9a534c7a4c45
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 12:43:21 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 18 12:43:23 2015 -0500

    fixup! Fortran: Add infrastructure to detect compiler version
    
    The compiler may put all INFO strings together so we need to match
    each one explicitly.

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 9db38b7..d22a867 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -449,13 +449,15 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
         string(REGEX REPLACE "^0+([0-9])" "\\1" COMPILER_VERSION "${CMAKE_MATCH_1}")
         string(REGEX REPLACE "\\.0+([0-9])" ".\\1" COMPILER_VERSION "${COMPILER_VERSION}")
       endif()
-      if("${info}" MATCHES "INFO:compiler_version_([A-Z]+)_digit_([0-9])\\[([0-9])\\]")
-        set(comp ${CMAKE_MATCH_1})
-        set(digit ${CMAKE_MATCH_2})
-        set(value ${CMAKE_MATCH_3})
-        math(EXPR COMPILER_VERSION_${comp} "${COMPILER_VERSION_${comp}} + ${value} * ${DIGIT_VALUE_${digit}}")
-        set(HAVE_COMPILER_VERSION_${comp} 1)
-      endif()
+      foreach(comp MAJOR MINOR PATCH TWEAK)
+        foreach(digit 1 2 3 4 5 6 7 8 9)
+          if("${info}" MATCHES "INFO:compiler_version_${comp}_digit_${digit}\\[([0-9])\\]")
+            set(value ${CMAKE_MATCH_1})
+            math(EXPR COMPILER_VERSION_${comp} "${COMPILER_VERSION_${comp}} + ${value} * ${DIGIT_VALUE_${digit}}")
+            set(HAVE_COMPILER_VERSION_${comp} 1)
+          endif()
+        endforeach()
+      endforeach()
       if("${info}" MATCHES "INFO:simulate\\[([^]\"]*)\\]")
         set(SIMULATE_ID "${CMAKE_MATCH_1}")
       endif()

-----------------------------------------------------------------------

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake