diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-01 15:41:32 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-01 15:41:32 (GMT) |
| commit | f695b6b3bb0347ec47e6457d330237920d6e7cf7 (patch) | |
| tree | c526e827ea6e08b2a582d05bac9abb159776737b /Source | |
| parent | 6fb747a01c27a2226fe4cbf77bc19e6d21286f81 (diff) | |
| parent | 5117389931e1c845d81a9b50382d42e0cfb46bdc (diff) | |
| download | CMake-f695b6b3bb0347ec47e6457d330237920d6e7cf7.zip CMake-f695b6b3bb0347ec47e6457d330237920d6e7cf7.tar.gz CMake-f695b6b3bb0347ec47e6457d330237920d6e7cf7.tar.bz2 | |
Merge branch 'vs-v142-version' into release-3.15
Merge-request: !3874
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudioVersionedGenerator.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx index 2ba1aff..1eca1f6 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"; |