mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-08 15:19:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Rename default generator selection internal variable

Browse Source
This commit is contained in:
Brad King
2016-10-11 11:50:56 -04:00
parent 0838d20e50
commit 10160f691c
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmake.cxx
+3 -4
View File
@@ -1444,7 +1444,7 @@ int cmake::ActualConfigure()
void cmake::CreateDefaultGlobalGenerator()
{
#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(CMAKE_BOOT_MINGW)
std::string installedCompiler;
std::string found;
// Try to find the newest VS installed on the computer and
// use that as a default if -G is not specified
const std::string vsregBase = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\";
@@ -1477,13 +1477,12 @@ void cmake::CreateDefaultGlobalGenerator()
if (cmSystemTools::ReadRegistryValue(reg, dir,
cmSystemTools::KeyWOW64_32) &&
cmSystemTools::PathExists(dir)) {
installedCompiler = version[i].GeneratorName;
found = version[i].GeneratorName;
break;
}
}
}
cmGlobalGenerator* gen =
this->CreateGlobalGenerator(installedCompiler.c_str());
cmGlobalGenerator* gen = this->CreateGlobalGenerator(found);
if (!gen) {
gen = new cmGlobalNMakeMakefileGenerator(this);
}