diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2011-09-30 19:52:37 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2011-09-30 19:52:37 (GMT) |
| commit | 0cd3606afde42c3cf3ef706d11e6da2981e06a67 (patch) | |
| tree | 8eab9715456d3498e8eb7b4d4a77c3d36cff7e33 /Source/cmLocalVisualStudio7Generator.cxx | |
| parent | 72bac428cc9caaeb52b069c97845e3d031eded4a (diff) | |
| download | CMake-0cd3606afde42c3cf3ef706d11e6da2981e06a67.zip CMake-0cd3606afde42c3cf3ef706d11e6da2981e06a67.tar.gz CMake-0cd3606afde42c3cf3ef706d11e6da2981e06a67.tar.bz2 | |
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.
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
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"; } |