[Cmake-commits] CMake branch, next, updated. v3.4.0-rc3-1325-g0110ad2

[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  0110ad290e5796cc8c511f48939b9f79f67cc653 (commit)
       via  09f754f040f3e817cd69337adea2c73cb61d53da (commit)
      from  f8a917d886a41d5fbc2c734db8b078eebce1f33d (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0110ad290e5796cc8c511f48939b9f79f67cc653
commit 0110ad290e5796cc8c511f48939b9f79f67cc653
Merge: f8a917d 09f754f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 12 10:59:34 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 12 10:59:34 2015 -0500

    Merge topic 'cray-fortran-version' into next
    
    09f754f0 Cray: Implement Fortran compiler version detection (#15845)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09f754f040f3e817cd69337adea2c73cb61d53da
commit 09f754f040f3e817cd69337adea2c73cb61d53da
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 12 10:55:11 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 12 10:56:23 2015 -0500

    Cray: Implement Fortran compiler version detection (#15845)
    
    We already recognize the Cray Fortran compiler id.  Extract the version
    number using the same predefined macros we already use for Cray C and
    C++ compilers.

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 2533d3f..8c4c1e2 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -45,6 +45,8 @@
 # define COMPILER_VERSION_PATCH HEX(__SUNPRO_F90    & 0xF)
 #elif defined(_CRAYFTN)
         PRINT *, 'INFO:compiler[Cray]'
+# define COMPILER_VERSION_MAJOR DEC(_RELEASE_MAJOR)
+# define COMPILER_VERSION_MINOR DEC(_RELEASE_MINOR)
 #elif defined(__G95__)
         PRINT *, 'INFO:compiler[G95]'
 # define COMPILER_VERSION_MAJOR DEC(__G95__)

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

Summary of changes:
 Modules/CMakeFortranCompilerId.F.in |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake