[Cmake-commits] CMake branch, next, updated. v2.8.5-1997-gbd5b17a

[Bill Hoffman]

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  bd5b17a2a5a97f62840b90f82fb0057bbe8e0efe (commit)
       via  8f1ee5181d9a4c8c17f516a01a1772a741e3cb14 (commit)
      from  3942d6f1f7bf8c946206ab82d8e87449be2ce76b (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=bd5b17a2a5a97f62840b90f82fb0057bbe8e0efe
commit bd5b17a2a5a97f62840b90f82fb0057bbe8e0efe
Merge: 3942d6f 8f1ee51
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Sep 30 17:14:29 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 30 17:14:29 2011 -0400

    Merge topic 'fix_intel_vs_version' into next
    
    8f1ee51 Also, check for 11.x as an intel fortran version.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f1ee5181d9a4c8c17f516a01a1772a741e3cb14
commit 8f1ee5181d9a4c8c17f516a01a1772a741e3cb14
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Sep 30 17:11:34 2011 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Fri Sep 30 17:11:34 2011 -0400

    Also, check for 11.x as an intel fortran version.
    
    As Dave Cole pointed out the previous commit only checked for 10.x and 12.x.
    11.0 was accounted for, but 11.1, 11.2 and 11.3 were not.  This patch
    should make it work for those versions as well.  I did a web check and there
    are 11.0, 11.1, 11.2 and 11.3 versions from Intel. I assume if 12.x uses
    11.0 as the version in the .vfproj file, then all of the 11.x versions would
    as well.

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

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

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


hooks/post-receive
-- 
CMake