Merge topic 'drop-old-vs-dependency'

4bb6e24 VS,Xcode: Drop incorrect legacy dependency trace (#14291)

6 files changed, 6 insertions, 25 deletions

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 89ae4e7..4e871d6 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -55,7 +55,6 @@ cmLocalGenerator::cmLocalGenerator()
   this->UseRelativePaths = false;
   this->Configured = false;
   this->EmitUniversalBinaryFlags = true;
-  this->IsMakefileGenerator = false;
   this->RelativePathsConfigured = false;
   this->PathConversionsSetup = false;
   this->BackwardsCompatibility = 0;
@@ -260,12 +259,7 @@ void cmLocalGenerator::TraceDependencies()
   cmTargets& targets = this->Makefile->GetTargets();
   for(cmTargets::iterator t = targets.begin(); t != targets.end(); ++t)
     {
-    const char* projectFilename = 0;
-    if (this->IsMakefileGenerator == false)  // only use of this variable
-      {
-      projectFilename = t->second.GetName();
-      }
-    t->second.TraceDependencies(projectFilename);
+    t->second.TraceDependencies();
     }
 }
 
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 9d0aba1..ed0f6e3 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -441,8 +441,6 @@ protected:
   bool IgnoreLibPrefix;
   bool Configured;
   bool EmitUniversalBinaryFlags;
-  // A type flag is not nice. It's used only in TraceDependencies().
-  bool IsMakefileGenerator;
   // Hack for ExpandRuleVariable until object-oriented version is
   // committed.
   std::string TargetImplib;
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index bdc3d80..a522e37 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -27,7 +27,6 @@ cmLocalNinjaGenerator::cmLocalNinjaGenerator()
   , ConfigName("")
   , HomeRelativeOutputPath("")
 {
-  this->IsMakefileGenerator = true;
 #ifdef _WIN32
   this->WindowsShell = true;
 #endif
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 1d1acfd..56da1f9 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -92,7 +92,6 @@ cmLocalUnixMakefileGenerator3::cmLocalUnixMakefileGenerator3()
   this->SkipPreprocessedSourceRules = false;
   this->SkipAssemblySourceRules = false;
   this->MakeCommandEscapeTargetTwice = false;
-  this->IsMakefileGenerator = true;
   this->BorlandMakeCurlyHack = false;
 }
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 205ebb8..70500cd 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1839,8 +1839,7 @@ bool cmTarget::IsBundleOnApple()
 class cmTargetTraceDependencies
 {
 public:
-  cmTargetTraceDependencies(cmTarget* target, cmTargetInternals* internal,
-                            const char* vsProjectFile);
+  cmTargetTraceDependencies(cmTarget* target, cmTargetInternals* internal);
   void Trace();
 private:
   cmTarget* Target;
@@ -1864,8 +1863,7 @@ private:
 
 //----------------------------------------------------------------------------
 cmTargetTraceDependencies
-::cmTargetTraceDependencies(cmTarget* target, cmTargetInternals* internal,
-                            const char* vsProjectFile):
+::cmTargetTraceDependencies(cmTarget* target, cmTargetInternals* internal):
   Target(target), Internal(internal)
 {
   // Convenience.
@@ -1882,13 +1880,6 @@ cmTargetTraceDependencies
     this->QueueSource(*si);
     }
 
-  // Queue the VS project file to check dependencies on the rule to
-  // generate it.
-  if(vsProjectFile)
-    {
-    this->FollowName(vsProjectFile);
-    }
-
   // Queue pre-build, pre-link, and post-build rule dependencies.
   this->CheckCustomCommands(this->Target->GetPreBuildCommands());
   this->CheckCustomCommands(this->Target->GetPreLinkCommands());
@@ -2107,7 +2098,7 @@ cmTargetTraceDependencies
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::TraceDependencies(const char* vsProjectFile)
+void cmTarget::TraceDependencies()
 {
   // CMake-generated targets have no dependencies to trace.  Normally tracing
   // would find nothing anyway, but when building CMake itself the "install"
@@ -2119,7 +2110,7 @@ void cmTarget::TraceDependencies(const char* vsProjectFile)
     }
 
   // Use a helper object to trace the dependencies.
-  cmTargetTraceDependencies tracer(this, this->Internal.Get(), vsProjectFile);
+  cmTargetTraceDependencies tracer(this, this->Internal.Get());
   tracer.Trace();
 }
 
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 3d8accd..0da0f12 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -340,7 +340,7 @@ public:
    * Trace through the source files in this target and add al source files
    * that they depend on, used by all generators
    */
-  void TraceDependencies(const char* vsProjectFile);
+  void TraceDependencies();
 
   /**
    * Make sure the full path to all source files is known.