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

Merge topic 'vs-intel-version' 

cd90a0e VS: Future-proof Intel project format selection
This commit is contained in:
Brad King 2013-09-12 08:46:30 -04:00 committed by CMake Topic Stage
parent 85e35a3aed cd90a0eadd
commit 00e44b6f0d
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -1954,23 +1954,27 @@ cmLocalVisualStudio7Generator
// Compute the version of the Intel plugin to the VS IDE.
// If the key does not exist then use a default guess.
std::string intelVersion = "9.10";
std::string intelVersion;
std::string vskey = gg->GetRegistryBase();
vskey += "\\Packages\\" CM_INTEL_PLUGIN_GUID ";ProductVersion";
cmSystemTools::ReadRegistryValue(vskey.c_str(), intelVersion,
cmSystemTools::KeyWOW64_32);
if (intelVersion.find("13") == 0 ||
intelVersion.find("12") == 0 ||
intelVersion.find("11") == 0)
unsigned int intelVersionNumber = ~0u;
sscanf(intelVersion.c_str(), "%u", &intelVersionNumber);
if(intelVersionNumber >= 11)
{
// Version 11.x, 12.x, and 13.x actually use 11.0 in project files!
intelVersion = "11.0" ;
// Default to latest known project file version.
intelVersion = "11.0";
}
else if(intelVersion.find("10") == 0)
else if(intelVersionNumber == 10)
{
// Version 10.x actually uses 9.10 in project files!
intelVersion = "9.10";
}
else
{
// Version <= 9: use ProductVersion from registry.
}
fout << "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\n"
<< "<VisualStudioProject\n"