summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorBasil Fierz <basil.fierz@hotmail.com>2018-05-19 11:23:21 (GMT)
committerBrad King <brad.king@kitware.com>2018-05-29 14:12:59 (GMT)
commit5f1316841944198037d6463d3ddd12efcfae45b3 (patch)
tree3a58c25a578caa6813fa66efcc18eac968991368 /Source/cmVisualStudio10TargetGenerator.cxx
parenta543a233a280f23e72ce5ff7d7a00239bd8634fb (diff)
downloadCMake-5f1316841944198037d6463d3ddd12efcfae45b3.zip
CMake-5f1316841944198037d6463d3ddd12efcfae45b3.tar.gz
CMake-5f1316841944198037d6463d3ddd12efcfae45b3.tar.bz2
VS: Add option to select the version of the toolset used by VS 2017
Add new `version=` parameter in the toolset setting to select the version. Add variable `CMAKE_VS_PLATFORM_TOOLSET_VERSION` to hold the version, if one is set (blank indicates default). Fixes: #17549
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index f3b9c84..f16db76 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -557,6 +557,11 @@ void cmVisualStudio10TargetGenerator::Generate()
switch (this->ProjectType) {
case vcxproj:
+ if (this->GlobalGenerator->GetPlatformToolsetVersion()) {
+ Elem(e0, "Import")
+ .Attribute("Project",
+ this->GlobalGenerator->GetAuxiliaryToolset());
+ }
Elem(e0, "Import").Attribute("Project", VS10_CXX_DEFAULT_PROPS);
break;
case csproj: