diff options
author | Brad King <brad.king@kitware.com> | 2016-10-11 15:50:56 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-10-11 15:50:56 (GMT) |
commit | 10160f691c5fa6849a02383d727b30da648aa878 (patch) | |
tree | 64109a7400547e7b520e28626b9d02c03fda6c67 /Source | |
parent | 0838d20e506ed6bf064b51f7ef2d026c76b4af3d (diff) | |
download | CMake-10160f691c5fa6849a02383d727b30da648aa878.zip CMake-10160f691c5fa6849a02383d727b30da648aa878.tar.gz CMake-10160f691c5fa6849a02383d727b30da648aa878.tar.bz2 |
cmake: Rename default generator selection internal variable
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmake.cxx | 7 |
1 files 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); } |