summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio10Generator.h
diff options
context:
space:
mode:
authorStephan Szabo <stephan.szabo@sony.com>2019-01-03 20:54:24 (GMT)
committerStephan Szabo <stephan.szabo@sony.com>2019-01-03 21:25:19 (GMT)
commitc8ba777f6dfd7a5d8a4c4fa7b420bbdb5b93b366 (patch)
tree1751eee048ab386a8fd7849e3a1c4cecc5ce419f /Source/cmGlobalVisualStudio10Generator.h
parent6b163fc6e5b21f5107afab5a270617ae0efc9ace (diff)
downloadCMake-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/cmGlobalVisualStudio10Generator.h')
-rw-r--r--Source/cmGlobalVisualStudio10Generator.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 15244ac..ab55f06 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -144,7 +144,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;