diff options
| author | Stephan Szabo <stephan.szabo@sony.com> | 2018-11-28 15:32:14 (GMT) |
|---|---|---|
| committer | Stephan Szabo <stephan.szabo@sony.com> | 2018-11-28 15:43:31 (GMT) |
| commit | 6d855fbf442d1ab3b209ac9b46f97ad8e567df41 (patch) | |
| tree | d62e45c60810f43f0d86a7c6e6635165969e759e /Source/cmVisualStudio10ToolsetOptions.h | |
| parent | 9c60ae5f1105d6d793f2693630bf09abb7d66935 (diff) | |
| download | CMake-6d855fbf442d1ab3b209ac9b46f97ad8e567df41.zip CMake-6d855fbf442d1ab3b209ac9b46f97ad8e567df41.tar.gz CMake-6d855fbf442d1ab3b209ac9b46f97ad8e567df41.tar.bz2 | |
Replace header flag tables with json reading
Stop loading flag tables from header files and instead load the flag table
information from json files in Templates/MSBuild/FlagTables.
Diffstat (limited to 'Source/cmVisualStudio10ToolsetOptions.h')
| -rw-r--r-- | Source/cmVisualStudio10ToolsetOptions.h | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/Source/cmVisualStudio10ToolsetOptions.h b/Source/cmVisualStudio10ToolsetOptions.h index c736a49..43946f0 100644 --- a/Source/cmVisualStudio10ToolsetOptions.h +++ b/Source/cmVisualStudio10ToolsetOptions.h @@ -7,8 +7,6 @@ #include <string> -struct cmIDEFlagTable; - /** \class cmVisualStudio10ToolsetOptions * \brief Retrieves toolset options for MSBuild. * @@ -17,18 +15,24 @@ struct cmIDEFlagTable; class cmVisualStudio10ToolsetOptions { public: - cmIDEFlagTable const* GetClFlagTable(std::string const& name, - std::string const& toolset) const; - cmIDEFlagTable const* GetCSharpFlagTable(std::string const& name, - std::string const& toolset) const; - cmIDEFlagTable const* GetRcFlagTable(std::string const& name, - std::string const& toolset) const; - cmIDEFlagTable const* GetLibFlagTable(std::string const& name, - std::string const& toolset) const; - cmIDEFlagTable const* GetLinkFlagTable(std::string const& name, - std::string const& toolset) const; - cmIDEFlagTable const* GetMasmFlagTable(std::string const& name, - std::string const& toolset) const; + std::string GetClFlagTableName(std::string const& name, + std::string const& toolset, + std::string const& defaultToolset) const; + std::string GetCSharpFlagTableName(std::string const& name, + std::string const& toolset, + std::string const& defaultToolset) const; + std::string GetRcFlagTableName(std::string const& name, + std::string const& toolset, + std::string const& defaultToolset) const; + std::string GetLibFlagTableName(std::string const& name, + std::string const& toolset, + std::string const& defaultToolset) const; + std::string GetLinkFlagTableName(std::string const& name, + std::string const& toolset, + std::string const& defaultToolset) const; + std::string GetMasmFlagTableName(std::string const& name, + std::string const& toolset, + std::string const& defaultToolset) const; private: std::string GetToolsetName(std::string const& name, |