kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Bill Hoffman 2011-09-30 15:52:37 -04:00
parent 72bac428cc
commit 0cd3606afd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -1836,14 +1836,14 @@ cmLocalVisualStudio7Generator
vskey += "\\Packages\\" CM_INTEL_PLUGIN_GUID ";ProductVersion"; vskey += "\\Packages\\" CM_INTEL_PLUGIN_GUID ";ProductVersion";
cmSystemTools::ReadRegistryValue(vskey.c_str(), intelVersion, cmSystemTools::ReadRegistryValue(vskey.c_str(), intelVersion,
cmSystemTools::KeyWOW64_32); 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" ; 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"; intelVersion = "9.10";
} }