From 88c70dde34e76b79111adecc31493e9222e96e9c Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 6 May 2024 14:47:17 -0400 Subject: cmGlobalVisualStudioGenerator: Use member 'Version' more directly --- Source/cmGlobalVisualStudio10Generator.cxx | 2 +- Source/cmGlobalVisualStudio7Generator.cxx | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 91fbccc..c92ec4e 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -518,7 +518,7 @@ bool cmGlobalVisualStudio10Generator::InitializeWindowsCE(cmMakefile* mf) this->DefaultPlatformToolset = this->SelectWindowsCEToolset(); - if (this->GetVersion() == cmGlobalVisualStudioGenerator::VSVersion::VS12) { + if (this->Version == cmGlobalVisualStudioGenerator::VSVersion::VS12) { // VS 12 .NET CF defaults to .NET framework 3.9 for Windows CE. this->DefaultTargetFrameworkVersion = "v3.9"; this->DefaultTargetFrameworkIdentifier = "WindowsEmbeddedCompact"; diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index 866ace2..8cbb573 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -403,8 +403,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetConfigurations( std::string mapping; // On VS 19 and above, always map .NET SDK projects to "Any CPU". - if (target->IsDotNetSdkTarget() && - this->GetVersion() >= VSVersion::VS16 && + if (target->IsDotNetSdkTarget() && this->Version >= VSVersion::VS16 && !cmGlobalVisualStudio7Generator::IsReservedTarget( target->GetName())) { mapping = "Any CPU"; -- cgit v0.12