From 1826a41cddd64b8a7cd15c2ad8a5f9a8eaa391e5 Mon Sep 17 00:00:00 2001 From: "John W. Parent" <45471568+johnwparent@users.noreply.github.com> Date: Fri, 3 Feb 2023 20:53:24 -0500 Subject: MSVC compiler: add platform toolset version (#35098) --- lib/spack/spack/compilers/msvc.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/compilers/msvc.py b/lib/spack/spack/compilers/msvc.py index 91ebc8f25f..7a8432ecfa 100644 --- a/lib/spack/spack/compilers/msvc.py +++ b/lib/spack/spack/compilers/msvc.py @@ -103,11 +103,22 @@ class Msvc(Compiler): """ This is the shorthand VCToolset version of form MSVC *NOT* the full version, for that see - Msvc.msvc_version + Msvc.msvc_version or MSVC.platform_toolset_ver for the + raw platform toolset version """ - ver = self.msvc_version[:2].joined.string[:3] + ver = self.platform_toolset_ver return "MSVC" + ver + @property + def platform_toolset_ver(self): + """ + This is the platform toolset version of current MSVC compiler + i.e. 142. + This is different from the VC toolset version as established + by `short_msvc_version` + """ + return self.msvc_version[:2].joined.string[:3] + @property def cl_version(self): """Cl toolset version""" -- cgit v1.2.3-70-g09d2