[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-974-g35313e8

Brad King brad.king at kitware.com
Mon Oct 26 13:02:57 EDT 2015


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  35313e8e7b9286388c51bd4c5cbe0e4886730e47 (commit)
       via  77be366c5841d08c4128ae83946a48093fdbe789 (commit)
      from  9b73251ba80778b7e4c97dabe549e285d478d7b3 (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=35313e8e7b9286388c51bd4c5cbe0e4886730e47
commit 35313e8e7b9286388c51bd4c5cbe0e4886730e47
Merge: 9b73251 77be366
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 13:02:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 13:02:56 2015 -0400

    Merge topic 'intel-fortran-2016' into next
    
    77be366c Intel: Recognize MSVC version for Intel Fortran 2016 (#15809)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77be366c5841d08c4128ae83946a48093fdbe789
commit 77be366c5841d08c4128ae83946a48093fdbe789
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 13:00:15 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 26 13:02:37 2015 -0400

    Intel: Recognize MSVC version for Intel Fortran 2016 (#15809)

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 2533d3f..017af91 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -17,7 +17,9 @@
 
 # if defined(_MSC_VER)
         PRINT *, 'INFO:simulate[MSVC]'
-#  if _MSC_VER >= 1800
+#  if _MSC_VER >= 1900
+        PRINT *, 'INFO:simulate_version[019.00]'
+#  elif _MSC_VER >= 1800
         PRINT *, 'INFO:simulate_version[018.00]'
 #  elif _MSC_VER >= 1700
         PRINT *, 'INFO:simulate_version[017.00]'

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

Summary of changes:
 Modules/CMakeFortranCompilerId.F.in |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list