[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4110-g05435df

[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  05435dfab93add5d256fab8df05fad4b60a0f9f9 (commit)
       via  cd90a0eadd799be2cdf568f8ed2df7549b6dd037 (commit)
       via  b2ce2f5e485dddd39f6fda04fbb5110e4e279c1c (commit)
      from  c8519dd1a03d1f19e4e465b32b6039ace785dc9a (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=05435dfab93add5d256fab8df05fad4b60a0f9f9
commit 05435dfab93add5d256fab8df05fad4b60a0f9f9
Merge: c8519dd cd90a0e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 10 13:45:57 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 10 13:45:57 2013 -0400

    Merge topic 'vs-intel-version' into next
    
    cd90a0e VS: Future-proof Intel project format selection
    b2ce2f5 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd90a0eadd799be2cdf568f8ed2df7549b6dd037
commit cd90a0eadd799be2cdf568f8ed2df7549b6dd037
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 10 12:00:33 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 10 13:44:10 2013 -0400

    VS: Future-proof Intel project format selection
    
    The version of Intel Fortran that actually uses 9.10 as a project format
    is very old.  Default to the latest format version (11.0) and use the
    older format only when known to be necessary.
    
    Suggested-by: Dick Munroe <munroe at csworks.com>

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 58cc6f4..bd6c860 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1954,23 +1954,27 @@ cmLocalVisualStudio7Generator
 
   // Compute the version of the Intel plugin to the VS IDE.
   // If the key does not exist then use a default guess.
-  std::string intelVersion = "9.10";
+  std::string intelVersion;
   std::string vskey = gg->GetRegistryBase();
   vskey += "\\Packages\\" CM_INTEL_PLUGIN_GUID ";ProductVersion";
   cmSystemTools::ReadRegistryValue(vskey.c_str(), intelVersion,
                                    cmSystemTools::KeyWOW64_32);
-  if (intelVersion.find("13") == 0 ||
-      intelVersion.find("12") == 0 ||
-      intelVersion.find("11") == 0)
+  unsigned int intelVersionNumber = ~0u;
+  sscanf(intelVersion.c_str(), "%u", &intelVersionNumber);
+  if(intelVersionNumber >= 11)
     {
-    // Version 11.x, 12.x, and 13.x actually use 11.0 in project files!
-    intelVersion = "11.0" ;
+    // Default to latest known project file version.
+    intelVersion = "11.0";
     }
-  else if(intelVersion.find("10") == 0)
+  else if(intelVersionNumber == 10)
     {
     // Version 10.x actually uses 9.10 in project files!
     intelVersion = "9.10";
     }
+  else
+    {
+    // Version <= 9: use ProductVersion from registry.
+    }
 
   fout << "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\n"
        << "<VisualStudioProject\n"

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

Summary of changes:
 Source/CMakeVersion.cmake                |    2 +-
 Source/cmLocalVisualStudio7Generator.cxx |   18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake