From 5117389931e1c845d81a9b50382d42e0cfb46bdc Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 1 Oct 2019 11:23:12 -0400 Subject: VS: Fix support for v142 toolset minor versions When using `-T v142,version=14.22` the `.props` file location is different starting with version `14.20` than it was in `14.16` and below. Adapt the path based on the version. Fixes: #19779 --- Source/cmGlobalVisualStudioVersionedGenerator.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Source') diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx index 2ba1affde0..1eca1f6003 100644 --- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx +++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx @@ -390,7 +390,9 @@ std::string cmGlobalVisualStudioVersionedGenerator::GetAuxiliaryToolset() const GetVSInstance(instancePath); std::stringstream path; path << instancePath; - path << "/VC/Auxiliary/Build/"; + path << "/VC/Auxiliary/Build"; + path << (cmSystemTools::VersionCompareGreaterEq(version, "14.20") ? '.' + : '/'); path << version; path << "/Microsoft.VCToolsVersion." << version << ".props"; -- cgit v1.2.1