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

Merge topic 'fix_intel_vs_version' 

8f1ee51 Also, check for 11.x as an intel fortran version.
0cd3606 Use version 11.0 for 12.x and 9.10 for 10.x intel versions to fix 12.1 vsIDE.
This commit is contained in:
David Cole 2011-10-03 11:54:15 -04:00 committed by CMake Topic Stage
parent a92b17e421 8f1ee5181d
commit 68e43c2fad
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 || (intelVersion.find("11") == 0))
{ {
// Version 12 actually uses 11.0 in project files! // Version 11.x and 12.x actually use 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";
} }