Merge topic 'intel-12-vs-2005'
3a8add0
ENH: Fix Intel 12 plugin project generation for VS < 10
This commit is contained in:
commit
7ffb678e4b
|
@ -1770,10 +1770,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")
|
||||||
// Version 10.1 actually uses 9.10 in project files!
|
|
||||||
if(intelVersion == "10.1")
|
|
||||||
{
|
{
|
||||||
|
// Version 12 actually uses 11.0 in project files!
|
||||||
|
intelVersion = "11.0" ;
|
||||||
|
}
|
||||||
|
else if(intelVersion == "10.1")
|
||||||
|
{
|
||||||
|
// Version 10.1 actually uses 9.10 in project files!
|
||||||
intelVersion = "9.10";
|
intelVersion = "9.10";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue