diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-11 15:35:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-11 15:36:03 (GMT) |
| commit | 5a283b79e5fe1739142cc513a9a701855849b2f8 (patch) | |
| tree | 4e5dc76ad0952a368b5f7e9a224d775cd29189fe /Source/cmGlobalVisualStudio11Generator.cxx | |
| parent | 73aca0572b30a46bf5b5e75daa300fabb6bbb8cc (diff) | |
| parent | b91f6f39f7be92bab1302c4587dd51423f20cf00 (diff) | |
| download | CMake-5a283b79e5fe1739142cc513a9a701855849b2f8.zip CMake-5a283b79e5fe1739142cc513a9a701855849b2f8.tar.gz CMake-5a283b79e5fe1739142cc513a9a701855849b2f8.tar.bz2 | |
Merge topic 'vs-refactor'
b91f6f39f7 VS: Track explicitly when platform is specified in generator name
89cc3d432b VS: Move platform name members to top-level global generator
40a732800d VS: Clarify global generator constructor interface
5ca7e5057b Help: Document VS generator default platform selection
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2786
Diffstat (limited to 'Source/cmGlobalVisualStudio11Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio11Generator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx index 499ae32..07318cf 100644 --- a/Source/cmGlobalVisualStudio11Generator.cxx +++ b/Source/cmGlobalVisualStudio11Generator.cxx @@ -92,8 +92,9 @@ cmGlobalGeneratorFactory* cmGlobalVisualStudio11Generator::NewFactory() } cmGlobalVisualStudio11Generator::cmGlobalVisualStudio11Generator( - cmake* cm, const std::string& name, const std::string& platformName) - : cmGlobalVisualStudio10Generator(cm, name, platformName) + cmake* cm, const std::string& name, + std::string const& platformInGeneratorName) + : cmGlobalVisualStudio10Generator(cm, name, platformInGeneratorName) { std::string vc11Express; this->ExpressEdition = cmSystemTools::ReadRegistryValue( |