diff options
| author | Brad King <brad.king@kitware.com> | 2019-12-12 16:38:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-12-12 16:38:15 (GMT) |
| commit | b3a536e726a601b2f17aaad14fee6cb0e215450a (patch) | |
| tree | c5a53a559db3a689c63514a75d546b8f24d7ae80 | |
| parent | 2ed1d2cfa3f209e9db2e8aa25411f87f3e4889b3 (diff) | |
| parent | 07612646fe28d86330cbd4db9cfd27be1d8fb90f (diff) | |
| download | CMake-b3a536e726a601b2f17aaad14fee6cb0e215450a.zip CMake-b3a536e726a601b2f17aaad14fee6cb0e215450a.tar.gz CMake-b3a536e726a601b2f17aaad14fee6cb0e215450a.tar.bz2 | |
Merge branch 'backport-3.15-vs-v142-version' into release-3.15
Merge-request: !4133
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 7 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudioVersionedGenerator.cxx | 20 |
2 files changed, 15 insertions, 12 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index d9002fb..edbc23b 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -284,10 +284,11 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS} set(id_cl icl.exe) endif() if(CMAKE_VS_PLATFORM_TOOLSET_VERSION) + set(id_sep "\\") if(CMAKE_VS_PLATFORM_TOOLSET_VERSION VERSION_GREATER_EQUAL "14.20") - set(id_sep ".") - else() - set(id_sep "\\") + if(EXISTS "${CMAKE_GENERATOR_INSTANCE}/VC/Auxiliary/Build.${CMAKE_VS_PLATFORM_TOOLSET_VERSION}/Microsoft.VCToolsVersion.${CMAKE_VS_PLATFORM_TOOLSET_VERSION}.props") + set(id_sep ".") + endif() endif() set(id_toolset_version_props "<Import Project=\"${CMAKE_GENERATOR_INSTANCE}\\VC\\Auxiliary\\Build${id_sep}${CMAKE_VS_PLATFORM_TOOLSET_VERSION}\\Microsoft.VCToolsVersion.${CMAKE_VS_PLATFORM_TOOLSET_VERSION}.props\" />") unset(id_sep) diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx index 1eca1f6..66a57eb 100644 --- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx +++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx @@ -388,15 +388,17 @@ std::string cmGlobalVisualStudioVersionedGenerator::GetAuxiliaryToolset() const if (version) { std::string instancePath; GetVSInstance(instancePath); - std::stringstream path; - path << instancePath; - path << "/VC/Auxiliary/Build"; - path << (cmSystemTools::VersionCompareGreaterEq(version, "14.20") ? '.' - : '/'); - path << version; - path << "/Microsoft.VCToolsVersion." << version << ".props"; - - std::string toolsetPath = path.str(); + std::string toolsetDir = instancePath + "/VC/Auxiliary/Build"; + char sep = '/'; + if (cmSystemTools::VersionCompareGreaterEq(version, "14.20")) { + std::string toolsetDot = toolsetDir + "." + version + + "/Microsoft.VCToolsVersion." + version + ".props"; + if (cmSystemTools::PathExists(toolsetDot)) { + sep = '.'; + } + } + std::string toolsetPath = toolsetDir + sep + version + + "/Microsoft.VCToolsVersion." + version + ".props"; cmSystemTools::ConvertToUnixSlashes(toolsetPath); return toolsetPath; } |