diff options
| author | Stephan Szabo <stephan.szabo@sony.com> | 2019-01-03 20:54:24 (GMT) |
|---|---|---|
| committer | Stephan Szabo <stephan.szabo@sony.com> | 2019-01-03 21:25:19 (GMT) |
| commit | c8ba777f6dfd7a5d8a4c4fa7b420bbdb5b93b366 (patch) | |
| tree | 1751eee048ab386a8fd7849e3a1c4cecc5ce419f /Source/cmVisualStudio10ToolsetOptions.h | |
| parent | 6b163fc6e5b21f5107afab5a270617ae0efc9ace (diff) | |
| download | CMake-c8ba777f6dfd7a5d8a4c4fa7b420bbdb5b93b366.zip CMake-c8ba777f6dfd7a5d8a4c4fa7b420bbdb5b93b366.tar.gz CMake-c8ba777f6dfd7a5d8a4c4fa7b420bbdb5b93b366.tar.bz2 | |
GlobalVisualStudio10Generator: Support non-standard toolset json flag files.
If given a toolset that does not have an explicit mapping in
cmVisualStudio10ToolsetOptions, check for a json flag file using the
toolset name before trying the default toolset for the generator.
Diffstat (limited to 'Source/cmVisualStudio10ToolsetOptions.h')
| -rw-r--r-- | Source/cmVisualStudio10ToolsetOptions.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/Source/cmVisualStudio10ToolsetOptions.h b/Source/cmVisualStudio10ToolsetOptions.h index 43946f0..875a35b 100644 --- a/Source/cmVisualStudio10ToolsetOptions.h +++ b/Source/cmVisualStudio10ToolsetOptions.h @@ -16,25 +16,17 @@ class cmVisualStudio10ToolsetOptions { public: std::string GetClFlagTableName(std::string const& name, - std::string const& toolset, - std::string const& defaultToolset) const; + std::string const& toolset) const; std::string GetCSharpFlagTableName(std::string const& name, - std::string const& toolset, - std::string const& defaultToolset) const; + std::string const& toolset) const; std::string GetRcFlagTableName(std::string const& name, - std::string const& toolset, - std::string const& defaultToolset) const; + std::string const& toolset) const; std::string GetLibFlagTableName(std::string const& name, - std::string const& toolset, - std::string const& defaultToolset) const; + std::string const& toolset) const; std::string GetLinkFlagTableName(std::string const& name, - std::string const& toolset, - std::string const& defaultToolset) const; + std::string const& toolset) const; std::string GetMasmFlagTableName(std::string const& name, - std::string const& toolset, - std::string const& defaultToolset) const; - -private: + std::string const& toolset) const; std::string GetToolsetName(std::string const& name, std::string const& toolset) const; }; |