Merge topic 'vs-no-regen-external-msproject'

e478f03 VS: Fix CMAKE_SUPPRESS_REGENERATION bad ZERO_CHECK dependency (#14378)

Source/cmGlobalVisualStudio8Generator.cxx

@@ -202,7 +202,7 @@ std::string cmGlobalVisualStudio8Generator::GetUserMacrosRegKeyBase()
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalVisualStudio8Generator::AddCheckTarget()
+bool cmGlobalVisualStudio8Generator::AddCheckTarget()
 {
   // Add a special target on which all other targets depend that
   // checks the build system and optionally re-runs CMake.
@@ -216,7 +216,7 @@ void cmGlobalVisualStudio8Generator::AddCheckTarget()
   // Skip the target if no regeneration is to be done.
   if(mf->IsOn("CMAKE_SUPPRESS_REGENERATION"))
     {
-    return;
+    return false;
     }
 
   std::string cmake_command = mf->GetRequiredDefinition("CMAKE_COMMAND");
@@ -315,13 +315,15 @@ void cmGlobalVisualStudio8Generator::AddCheckTarget()
     cmSystemTools::Error("Error adding rule for ", stamps[0].c_str());
     }
   }
+
+  return true;
 }
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio8Generator::Generate()
 {
-  this->AddCheckTarget();
-
+  if(this->AddCheckTarget())
+    {
     // All targets depend on the build-system check target.
     for(std::map<cmStdString,cmTarget *>::const_iterator
           ti = this->TotalTargets.begin();
@@ -332,6 +334,7 @@ void cmGlobalVisualStudio8Generator::Generate()
         ti->second->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
         }
       }
+    }
 
   // Now perform the main generation.
   this->cmGlobalVisualStudio7Generator::Generate();

Source/cmGlobalVisualStudio8Generator.h

@@ -71,7 +71,7 @@ protected:
 
   virtual bool VSLinksDependencies() const { return false; }
 
-  void AddCheckTarget();
+  bool AddCheckTarget();
 
   static cmIDEFlagTable const* GetExtraFlagTableVS8();
   virtual void WriteSLNHeader(std::ostream& fout);