Merge topic 'vs-instance-repeat' into release-3.22

9eaf0932af cmGlobalVisualStudioVersionedGenerator: Fix repeating SetGeneratorInstance

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6665

2 files changed, 6 insertions, 2 deletions

diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
index ec2e74fd93..f27b2c47d3 100644
--- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx
+++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
@@ -436,9 +436,11 @@ bool cmGlobalVisualStudioVersionedGenerator::MatchesGeneratorName(
 bool cmGlobalVisualStudioVersionedGenerator::SetGeneratorInstance(
   std::string const& i, cmMakefile* mf)
 {
-  if (this->GeneratorInstance && i == *(this->GeneratorInstance)) {
+  if (this->LastGeneratorInstanceString &&
+      i == *(this->LastGeneratorInstanceString)) {
     return true;
   }
+
   if (!i.empty()) {
     if (!this->vsSetupAPIHelper.SetVSInstance(i)) {
       std::ostringstream e;
@@ -478,6 +480,8 @@ bool cmGlobalVisualStudioVersionedGenerator::SetGeneratorInstance(
   // The selected instance may have a different MSBuild than previously found.
   this->MSBuildCommandInitialized = false;
 
+  this->LastGeneratorInstanceString = i;
+
   return true;
 }
 
diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.h b/Source/cmGlobalVisualStudioVersionedGenerator.h
index b7760ac72b..2aed65b87f 100644
--- a/Source/cmGlobalVisualStudioVersionedGenerator.h
+++ b/Source/cmGlobalVisualStudioVersionedGenerator.h
@@ -76,5 +76,5 @@ private:
   class Factory17;
   friend class Factory17;
   mutable cmVSSetupAPIHelper vsSetupAPIHelper;
-  cm::optional<std::string> GeneratorInstance;
+  cm::optional<std::string> LastGeneratorInstanceString;
 };