From f034bb2f54f784461ed1adea8f0554d49ff5b0b3 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 12 Apr 2015 18:54:42 +0200 Subject: Remove redundant calls to MakeStartDirectoriesCurrent. The SetStart{,Output}Directory methods do what it does. --- Source/cmGlobalGenerator.cxx | 1 - Source/cmGlobalUnixMakefileGenerator3.cxx | 1 - Source/cmcmd.cxx | 1 - 3 files changed, 3 deletions(-) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 4a9f628..0492a4c 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1103,7 +1103,6 @@ void cmGlobalGenerator::Configure() (this->CMakeInstance->GetStartDirectory()); lg->GetMakefile()->SetStartOutputDirectory (this->CMakeInstance->GetStartOutputDirectory()); - lg->GetMakefile()->MakeStartDirectoriesCurrent(); this->BinaryDirectories.insert(mf->GetStartOutputDirectory()); diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 22d633c..3deaec2 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -587,7 +587,6 @@ void cmGlobalUnixMakefileGenerator3 (this->CMakeInstance->GetStartDirectory()); lg->GetMakefile()->SetStartOutputDirectory (this->CMakeInstance->GetStartOutputDirectory()); - lg->GetMakefile()->MakeStartDirectoriesCurrent(); } std::string tname = targetName; diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 2ef04ef..db85b59 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -651,7 +651,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector& args) cmsys::auto_ptr lgd(ggd->CreateLocalGenerator()); lgd->GetMakefile()->SetStartDirectory(startDir); lgd->GetMakefile()->SetStartOutputDirectory(startOutDir); - lgd->GetMakefile()->MakeStartDirectoriesCurrent(); // Actually scan dependencies. return lgd->UpdateDependencies(depInfo.c_str(), -- cgit v0.12