diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-08 20:25:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-15 13:15:37 (GMT) |
| commit | f773933f2630a17ce6b3b2aa6f8d7d8b65eb336c (patch) | |
| tree | 5efd0ff7844eadfdf37c045bba5c8ea09e967aa8 /Source/cmGlobalVisualStudio12Generator.h | |
| parent | d9e2b9a909b5f5b51ef3a106ed1d60a8d4cb795a (diff) | |
| download | CMake-f773933f2630a17ce6b3b2aa6f8d7d8b65eb336c.zip CMake-f773933f2630a17ce6b3b2aa6f8d7d8b65eb336c.tar.gz CMake-f773933f2630a17ce6b3b2aa6f8d7d8b65eb336c.tar.bz2 | |
VS: Refactor generator toolset parsing
We parse `CMAKE_GENERATOR_TOOLSET` values of the forms:
* `toolset`
* `toolset,host=x64`
* `host=x64`
Generalize the parsing to support the forms:
* `toolset`
* `toolset[,key=value]*`
* `key=value[,key=value]*`
Disallow duplicate keys. Require all but the first field to
be of `key=value` form.
Diffstat (limited to 'Source/cmGlobalVisualStudio12Generator.h')
| -rw-r--r-- | Source/cmGlobalVisualStudio12Generator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio12Generator.h b/Source/cmGlobalVisualStudio12Generator.h index 79efe52..3453628 100644 --- a/Source/cmGlobalVisualStudio12Generator.h +++ b/Source/cmGlobalVisualStudio12Generator.h @@ -31,8 +31,8 @@ public: // version number virtual const char* GetToolsVersion() { return "12.0"; } protected: - bool ParseGeneratorToolset(std::string const& ts, - cmMakefile* mf) CM_OVERRIDE; + bool ProcessGeneratorToolsetField(std::string const& key, + std::string const& value) CM_OVERRIDE; virtual bool InitializeWindowsPhone(cmMakefile* mf); virtual bool InitializeWindowsStore(cmMakefile* mf); |