[Cmake-commits] CMake branch, next, updated. v2.8.5-1990-g8840882

[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  88408823c3aead1650c596781a8d9f675a4f0373 (commit)
       via  0cd3606afde42c3cf3ef706d11e6da2981e06a67 (commit)
       via  72bac428cc9caaeb52b069c97845e3d031eded4a (commit)
      from  cf2e0df02e9d422897075ca10e7776c97f2221bd (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=88408823c3aead1650c596781a8d9f675a4f0373
commit 88408823c3aead1650c596781a8d9f675a4f0373
Merge: cf2e0df 0cd3606
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Sep 30 15:57:00 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 30 15:57:00 2011 -0400

    Merge topic 'fix_intel_vs_version' into next
    
    0cd3606 Use version 11.0 for 12.x and 9.10 for 10.x intel versions to fix 12.1 vsIDE.
    72bac42 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cd3606afde42c3cf3ef706d11e6da2981e06a67
commit 0cd3606afde42c3cf3ef706d11e6da2981e06a67
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Sep 30 15:52:37 2011 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Fri Sep 30 15:52:37 2011 -0400

    Use version 11.0 for 12.x and 9.10 for 10.x intel versions to fix 12.1 vsIDE.
    
    The intel compiler for 12.0 and 12.1 are known to expect the file version
    to be 11.0 in the .vfproj file.  For 10.x it should be 9.10.  Prior to
    this fix 12.0 and 10.1 were the only values checked. If those did not match
    the actual version of intel was put in the vfproj file causing an error
    about future version load attempt in the IDE.

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

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

Summary of changes:
 Source/cmLocalVisualStudio7Generator.cxx |    8 ++++----
 Source/kwsys/kwsysDateStamp.cmake        |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake