mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-16 12:11:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'vs-v142-version'

Browse Source 
5117389931 VS: Fix support for v142 toolset minor versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3874
This commit is contained in:
Brad King
2019-10-02 11:47:16 +00:00
committed by Kitware Robot
parent c5bec56611 5117389931
commit 20e9151e6c
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/CMakeDetermineCompilerId.cmake
View File

@@ -284,7 +284,13 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
set(id_cl icl.exe)
endif()
if(CMAKE_VS_PLATFORM_TOOLSET_VERSION)
set(id_toolset_version_props "<Import Project=\"${CMAKE_GENERATOR_INSTANCE}\\VC\\Auxiliary\\Build\\${CMAKE_VS_PLATFORM_TOOLSET_VERSION}\\Microsoft.VCToolsVersion.${CMAKE_VS_PLATFORM_TOOLSET_VERSION}.props\" />")
if(CMAKE_VS_PLATFORM_TOOLSET_VERSION VERSION_GREATER_EQUAL "14.20")
set(id_sep ".")
else()
set(id_sep "\\")
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)
endif()
endif()
else()

4
Source/cmGlobalVisualStudioVersionedGenerator.cxx
View File

@@ -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";