diff options
author | Brad King <brad.king@kitware.com> | 2019-01-18 16:08:45 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2019-01-18 17:29:53 (GMT) |
commit | 8144b00e32cf1e24daf41353cbcd1806311ceac9 (patch) | |
tree | 9dab608492a1c0faa7f5381524ffcd7d2c88334d /Source/cmGlobalVisualStudioVersionedGenerator.cxx | |
parent | b70c0aed5c616edce5cbc803c7de92580f835f90 (diff) | |
download | CMake-8144b00e32cf1e24daf41353cbcd1806311ceac9.zip CMake-8144b00e32cf1e24daf41353cbcd1806311ceac9.tar.gz CMake-8144b00e32cf1e24daf41353cbcd1806311ceac9.tar.bz2 |
Split global generator factory list with and without platforms
Replace `cmGlobalGeneratorFactory::GetGenerators` with a pair of methods
to split the list of generator names into those that have platforms in
the name and those that do not.
Diffstat (limited to 'Source/cmGlobalVisualStudioVersionedGenerator.cxx')
-rw-r--r-- | Source/cmGlobalVisualStudioVersionedGenerator.cxx | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx index 15e52fe..0860294 100644 --- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx +++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx @@ -132,11 +132,19 @@ public: "Optional [arch] can be \"Win64\" or \"ARM\"."; } - void GetGenerators(std::vector<std::string>& names) const override + std::vector<std::string> GetGeneratorNames() const override { + std::vector<std::string> names; names.push_back(vs15generatorName); + return names; + } + + std::vector<std::string> GetGeneratorNamesWithPlatform() const override + { + std::vector<std::string> names; names.push_back(vs15generatorName + std::string(" ARM")); names.push_back(vs15generatorName + std::string(" Win64")); + return names; } bool SupportsToolset() const override { return true; } @@ -192,9 +200,16 @@ public: "Use -A option to specify architecture."; } - virtual void GetGenerators(std::vector<std::string>& names) const + std::vector<std::string> GetGeneratorNames() const override { + std::vector<std::string> names; names.push_back(vs16generatorName); + return names; + } + + std::vector<std::string> GetGeneratorNamesWithPlatform() const override + { + return std::vector<std::string>(); } bool SupportsToolset() const override { return true; } |