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

Also, check for 11.x as an intel fortran version. 

As Dave Cole pointed out the previous commit only checked for 10.x and 12.x.
11.0 was accounted for, but 11.1, 11.2 and 11.3 were not.  This patch
should make it work for those versions as well.  I did a web check and there
are 11.0, 11.1, 11.2 and 11.3 versions from Intel. I assume if 12.x uses
11.0 as the version in the .vfproj file, then all of the 11.x versions would
as well.
This commit is contained in:
Bill Hoffman 2011-09-30 17:11:34 -04:00
parent 0cd3606afd
commit 8f1ee5181d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -1836,9 +1836,9 @@ cmLocalVisualStudio7Generator
vskey += "\\Packages\\" CM_INTEL_PLUGIN_GUID ";ProductVersion";
cmSystemTools::ReadRegistryValue(vskey.c_str(), intelVersion,
cmSystemTools::KeyWOW64_32);
if (intelVersion.find("12") == 0)
if (intelVersion.find("12") == 0 || (intelVersion.find("11") == 0))
{
// Version 12.x actually uses 11.0 in project files!
// Version 11.x and 12.x actually use 11.0 in project files!
intelVersion = "11.0" ;
}
else if(intelVersion.find("10") == 0)