From 10160f691c5fa6849a02383d727b30da648aa878 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 11 Oct 2016 11:50:56 -0400 Subject: cmake: Rename default generator selection internal variable --- Source/cmake.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/cmake.cxx b/Source/cmake.cxx index be08fc7..ed4d453 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -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); } -- cgit v0.12