Merge topic 'drop-old-vs-dependency'

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

1 files changed, 4 insertions, 13 deletions

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();
 }