diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-16 14:49:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-16 14:50:00 (GMT) |
| commit | a8b447d72e13b3356893737adba0a46ea065f70d (patch) | |
| tree | e4f94e3c99f65b3c9be7ae05b6cdcb3fa7f52f1f /Source/cmGlobalVisualStudio10Generator.h | |
| parent | 68a30b50a5894d0425122ae4bbfd40b0492ff116 (diff) | |
| parent | c8ba777f6dfd7a5d8a4c4fa7b420bbdb5b93b366 (diff) | |
| download | CMake-a8b447d72e13b3356893737adba0a46ea065f70d.zip CMake-a8b447d72e13b3356893737adba0a46ea065f70d.tar.gz CMake-a8b447d72e13b3356893737adba0a46ea065f70d.tar.bz2 | |
Merge topic 'support_per_toolset_json_flags'
c8ba777f6d GlobalVisualStudio10Generator: Support non-standard toolset json flag files.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2772
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.h')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index 7f7c516..7c8918a 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -142,7 +142,9 @@ protected: std::string const& GetMSBuildCommand(); - cmIDEFlagTable const* LoadFlagTable(std::string const& flagTableName, + cmIDEFlagTable const* LoadFlagTable(std::string const& optionsName, + std::string const& toolsetName, + std::string const& defaultName, std::string const& table) const; std::string GeneratorToolset; |