[Cmake-commits] CMake branch, next, updated. v2.8.4-1530-ga9aac0e

[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  a9aac0e44ca7e45928d8274091d7e5a98c5381f8 (commit)
       via  3a8add058b09bc88fabb0ebe5bf59da95d7ebff2 (commit)
      from  313830d741e8db47d94c14bdd9760679ab3e192c (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=a9aac0e44ca7e45928d8274091d7e5a98c5381f8
commit a9aac0e44ca7e45928d8274091d7e5a98c5381f8
Merge: 313830d 3a8add0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 16 10:18:01 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 16 10:18:01 2011 -0400

    Merge topic 'intel-12-vs-2005' into next
    
    3a8add0 ENH: Fix Intel 12 plugin project generation for VS < 10


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a8add058b09bc88fabb0ebe5bf59da95d7ebff2
commit 3a8add058b09bc88fabb0ebe5bf59da95d7ebff2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 16 10:13:04 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 16 10:13:04 2011 -0400

    ENH: Fix Intel 12 plugin project generation for VS < 10
    
    Suggested-by: Dick Munroe <munroe at csworks.com>

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

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

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


hooks/post-receive
-- 
CMake