[Cmake-commits] CMake branch, next, updated. v2.8.8-3043-ga1de5ec

[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  a1de5ec6463cf250822309a241efbc02f559275e (commit)
       via  8945489c0727e5d9321a817fdb19c750dfcb1045 (commit)
      from  1ecbdf74042c065512baca4377cf67e522a81ad3 (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=a1de5ec6463cf250822309a241efbc02f559275e
commit a1de5ec6463cf250822309a241efbc02f559275e
Merge: 1ecbdf7 8945489
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 6 12:24:32 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 6 12:24:32 2012 -0400

    Merge topic 'VS-Fortran-Intel-2013' into next
    
    8945489 VS: Set Intel Fortran 13 project version


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8945489c0727e5d9321a817fdb19c750dfcb1045
commit 8945489c0727e5d9321a817fdb19c750dfcb1045
Author:     Zaheer Chothia <zaheer.chothia at gmail.com>
AuthorDate: Fri Jun 1 18:47:00 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 6 12:23:25 2012 -0400

    VS: Set Intel Fortran 13 project version
    
    I have tested that it works with:
    
     Microsoft Visual Studio 10.0.40219.1
     Intel Visual Fortran 13.0.0.041 Beta Build 20120425

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 9faf46d..f2ab79d 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1933,9 +1933,11 @@ cmLocalVisualStudio7Generator
   vskey += "\\Packages\\" CM_INTEL_PLUGIN_GUID ";ProductVersion";
   cmSystemTools::ReadRegistryValue(vskey.c_str(), intelVersion,
                                    cmSystemTools::KeyWOW64_32);
-  if (intelVersion.find("12") == 0 || (intelVersion.find("11") == 0))
+  if (intelVersion.find("13") == 0 ||
+      intelVersion.find("12") == 0 ||
+      intelVersion.find("11") == 0)
     {
-    // Version 11.x and 12.x actually use 11.0 in project files!
+    // Version 11.x, 12.x, and 13.x actually use 11.0 in project files!
     intelVersion = "11.0" ;
     }
   else if(intelVersion.find("10") == 0)

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

Summary of changes:
 Source/cmLocalVisualStudio7Generator.cxx |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake