[Cmake-commits] CMake branch, next, updated. v2.8.12-4073-gbeb45bd

[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  beb45bd3599cd1abc844a6fb3f4eb8bb78487f3e (commit)
       via  99f299dffd235f28bad413a85b4398a48c61b135 (commit)
      from  ff12e98513b95ec10d253f59b130900ac41967c0 (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=beb45bd3599cd1abc844a6fb3f4eb8bb78487f3e
commit beb45bd3599cd1abc844a6fb3f4eb8bb78487f3e
Merge: ff12e98 99f299d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 16 15:36:25 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 16 15:36:25 2013 -0400

    Merge topic 'vs-intel-compiler' into next
    
    99f299d Intel: Fix detection of MSVC version simulated by pre-11.0 Fortran


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99f299dffd235f28bad413a85b4398a48c61b135
commit 99f299dffd235f28bad413a85b4398a48c61b135
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 16 15:27:14 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 16 15:27:14 2013 -0400

    Intel: Fix detection of MSVC version simulated by pre-11.0 Fortran
    
    The Intel Fortran 10 64-bit compiler incorrectly defines _MSC_VER to its
    own version (1020) instead of the underlying MSVC tools version.  Since
    we expect the compiler to be used only with VS >= 7 tools, assume MSVC
    version 13.0 if _MSC_VER is not greater than 1300.

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index b8f8f7d..5349505 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -18,10 +18,8 @@
         PRINT *, 'INFO:simulate_version[014.00]'
 #  elif _MSC_VER >= 1310
         PRINT *, 'INFO:simulate_version[013.01]'
-#  elif _MSC_VER >= 1300
+#  else
         PRINT *, 'INFO:simulate_version[013.00]'
-#  elif _MSC_VER >= 1200
-        PRINT *, 'INFO:simulate_version[012.00]'
 #  endif
 # endif
 #elif defined(__SUNPRO_F90) || defined(__SUNPRO_F95)

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

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


hooks/post-receive
-- 
CMake