summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-04-12 16:54:42 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-04-20 22:12:51 (GMT)
commitf034bb2f54f784461ed1adea8f0554d49ff5b0b3 (patch)
treefc74b3f2c731c8e4b138922a5ab2c8acf764d0c6
parent3a68c323ba4b9f269fe9fe45fc2a1bcc2de4ac89 (diff)
downloadCMake-f034bb2f54f784461ed1adea8f0554d49ff5b0b3.zip
CMake-f034bb2f54f784461ed1adea8f0554d49ff5b0b3.tar.gz
CMake-f034bb2f54f784461ed1adea8f0554d49ff5b0b3.tar.bz2
Remove redundant calls to MakeStartDirectoriesCurrent.
The SetStart{,Output}Directory methods do what it does.
-rw-r--r--Source/cmGlobalGenerator.cxx1
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.cxx1
-rw-r--r--Source/cmcmd.cxx1
3 files changed, 0 insertions, 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<std::string>& args)
cmsys::auto_ptr<cmLocalGenerator> lgd(ggd->CreateLocalGenerator());
lgd->GetMakefile()->SetStartDirectory(startDir);
lgd->GetMakefile()->SetStartOutputDirectory(startOutDir);
- lgd->GetMakefile()->MakeStartDirectoriesCurrent();
// Actually scan dependencies.
return lgd->UpdateDependencies(depInfo.c_str(),