mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-09 07:11:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

VS: Fix support for v142 toolset minor versions in VS 16.5+

Browse Source 
The fix in commit 5117389931 (VS: Fix support for v142 toolset minor
versions, 2019-10-01, v3.16.0-rc1~32^2) worked around a bug in VS's
placement of toolset files.   VS 16.5 will fix that bug and restore the
original pattern for locations of toolset files.  Update our logic to
look for both possibilities.

Issue: #19779
This commit is contained in:
Brad King
2019-12-12 11:22:00 -05:00
parent 4771c4e447
commit d8d4924d98
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/CMakeDetermineCompilerId.cmake
View File

@@ -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)

23
Source/cmGlobalVisualStudioVersionedGenerator.cxx
View File

@@ -6,6 +6,7 @@
#include "cmDocumentationEntry.h"
#include "cmLocalVisualStudio10Generator.h"
#include "cmMakefile.h"
#include "cmStringAlgorithms.h"
#include "cmVSSetupHelper.h"
#include "cmake.h"
@@ -388,15 +389,19 @@ 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 =
cmStrCat(toolsetDir, '.', version, "/Microsoft.VCToolsVersion.",
version, ".props");
if (cmSystemTools::PathExists(toolsetDot)) {
sep = '.';
}
}
std::string toolsetPath =
cmStrCat(toolsetDir, sep, version, "/Microsoft.VCToolsVersion.", version,
".props");
cmSystemTools::ConvertToUnixSlashes(toolsetPath);
return toolsetPath;
}