diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-04 17:09:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-06-04 17:16:37 (GMT) |
| commit | 98afb4549f66c692eeec8bbc8a1f7b333d3051a5 (patch) | |
| tree | 28479e8e5b6545df3589041e0024eaf5f12d1005 /Source/cmGlobalVisualStudio12Generator.cxx | |
| parent | 3e9f6e36f3f5fd50303d1b71fc153c0ae8f916f5 (diff) | |
| download | CMake-98afb4549f66c692eeec8bbc8a1f7b333d3051a5.zip CMake-98afb4549f66c692eeec8bbc8a1f7b333d3051a5.tar.gz CMake-98afb4549f66c692eeec8bbc8a1f7b333d3051a5.tar.bz2 | |
VS: Split user- and generator-provided PlatformToolset
Divide the cmGlobalVisualStudio10Generator "PlatformToolset" member into
two members representing the generator-selected default toolset and the
user-specified CMAKE_GENERATOR_TOOLSET value. Prefer the user-specified
value, if any, and then fall back to the generator-selected default.
Diffstat (limited to 'Source/cmGlobalVisualStudio12Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio12Generator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx index 6cd9f12..40f8b05 100644 --- a/Source/cmGlobalVisualStudio12Generator.cxx +++ b/Source/cmGlobalVisualStudio12Generator.cxx @@ -92,7 +92,7 @@ cmGlobalVisualStudio12Generator::cmGlobalVisualStudio12Generator( this->ExpressEdition = cmSystemTools::ReadRegistryValue( "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\12.0\\Setup\\VC;" "ProductDir", vc12Express, cmSystemTools::KeyWOW64_32); - this->PlatformToolset = "v120"; + this->DefaultPlatformToolset = "v120"; } //---------------------------------------------------------------------------- |