[Cmake-commits] CMake branch, next, updated. v3.4.1-1605-g40c9095

[Chuck Atkins]

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  40c9095f5559abe6acb1bc106643d2fd75959795 (commit)
       via  71e5f253f9b035be7049f36dab2e942220ff6209 (commit)
      from  92f8b11450f00cf4e71a1bd42e55cc46a1dfb398 (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=40c9095f5559abe6acb1bc106643d2fd75959795
commit 40c9095f5559abe6acb1bc106643d2fd75959795
Merge: 92f8b11 71e5f25
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Fri Dec 4 10:29:29 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 4 10:29:29 2015 -0500

    Merge topic 'find-ftn-by-default' into next
    
    71e5f253 Fortran: Add ftn, the Cray compiler wrapper, to the default search.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=71e5f253f9b035be7049f36dab2e942220ff6209
commit 71e5f253f9b035be7049f36dab2e942220ff6209
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Fri Dec 4 10:28:03 2015 -0500
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Fri Dec 4 10:28:03 2015 -0500

    Fortran: Add ftn, the Cray compiler wrapper, to the default search.

diff --git a/Modules/CMakeDetermineFortranCompiler.cmake b/Modules/CMakeDetermineFortranCompiler.cmake
index 911ffac..ccafb07 100644
--- a/Modules/CMakeDetermineFortranCompiler.cmake
+++ b/Modules/CMakeDetermineFortranCompiler.cmake
@@ -54,6 +54,7 @@ else()
     if(NOT CMAKE_Fortran_COMPILER_INIT)
       # Known compilers:
       #  f77/f90/f95: generic compiler names
+      #  ftn: Cray fortran compiler wrapper
       #  g77: GNU Fortran 77 compiler
       #  gfortran: putative GNU Fortran 95+ compiler (in progress)
       #  fort77: native F77 compiler under HP-UX (and some older Crays)
@@ -73,6 +74,7 @@ else()
       #  then 77 or older compilers, gnu is always last in the group,
       #  so if you paid for a compiler it is picked by default.
       set(CMAKE_Fortran_COMPILER_LIST
+        ftn
         ifort ifc af95 af90 efc f95 pathf2003 pathf95 pgf95 pgfortran lf95 xlf95
         fort gfortran gfortran-4 g95 f90 pathf90 pgf90 xlf90 epcf90 fort77
         frt pgf77 xlf fl32 af77 g77 f77

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

Summary of changes:
 Modules/CMakeDetermineFortranCompiler.cmake |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake