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

VS11: Detect VS 2012 Express for default generator (#13348) 

Add WDExpress to the list of registry search locations.  Add VS 11 to
the list of VS versions and corresponding generator names.  Fix the
search logic to use the most recent version found under any registry
entry.

Inspired-by: Peter Kümmel <syntheticpp@gmx.net>
This commit is contained in:
Brad King 2012-09-16 00:01:32 +02:00
parent 875f3a4231
commit e17f3458ce
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmake.cxx
View File

@ -2184,6 +2184,7 @@ int cmake::ActualConfigure()
std::vector<std::string> vsVerions; std::vector<std::string> vsVerions;
vsVerions.push_back("VisualStudio\\"); vsVerions.push_back("VisualStudio\\");
vsVerions.push_back("VCExpress\\"); vsVerions.push_back("VCExpress\\");
vsVerions.push_back("WDExpress\\");
struct VSRegistryEntryName struct VSRegistryEntryName
{ {
const char* MSVersion; const char* MSVersion;
@ -2196,10 +2197,11 @@ int cmake::ActualConfigure()
{"8.0", "Visual Studio 8 2005"}, {"8.0", "Visual Studio 8 2005"},
{"9.0", "Visual Studio 9 2008"}, {"9.0", "Visual Studio 9 2008"},
{"10.0", "Visual Studio 10"}, {"10.0", "Visual Studio 10"},
{"11.0", "Visual Studio 11"},
{0, 0}}; {0, 0}};
for(size_t b=0; b < vsVerions.size() && installedCompiler.empty(); b++) for(int i=0; version[i].MSVersion != 0; i++)
{ {
for(int i =0; version[i].MSVersion != 0; i++) for(size_t b=0; b < vsVerions.size(); b++)
{ {
std::string reg = vsregBase + vsVerions[b] + version[i].MSVersion; std::string reg = vsregBase + vsVerions[b] + version[i].MSVersion;
reg += ";InstallDir]"; reg += ";InstallDir]";
@ -2208,6 +2210,7 @@ int cmake::ActualConfigure()
if (!(reg == "/registry")) if (!(reg == "/registry"))
{ {
installedCompiler = version[i].GeneratorName; installedCompiler = version[i].GeneratorName;
break;
} }
} }
} }