Merge topic 'drop-old-vs-dependency'
4bb6e24
VS,Xcode: Drop incorrect legacy dependency trace (#14291)
This commit is contained in:
commit
ff6de6d325
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -27,7 +27,6 @@ cmLocalNinjaGenerator::cmLocalNinjaGenerator()
|
|||
, ConfigName("")
|
||||
, HomeRelativeOutputPath("")
|
||||
{
|
||||
this->IsMakefileGenerator = true;
|
||||
#ifdef _WIN32
|
||||
this->WindowsShell = true;
|
||||
#endif
|
||||
|
|
|
@ -92,7 +92,6 @@ cmLocalUnixMakefileGenerator3::cmLocalUnixMakefileGenerator3()
|
|||
this->SkipPreprocessedSourceRules = false;
|
||||
this->SkipAssemblySourceRules = false;
|
||||
this->MakeCommandEscapeTargetTwice = false;
|
||||
this->IsMakefileGenerator = true;
|
||||
this->BorlandMakeCurlyHack = false;
|
||||
}
|
||||
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue