BUG: Avoid duplicate conversion to output path.
This commit is contained in:
parent
cdcbe2587a
commit
f0c79a0030
|
@ -464,9 +464,6 @@ cmGlobalUnixMakefileGenerator3
|
||||||
std::string makeTarget = lg->GetMakefile()->GetStartOutputDirectory();
|
std::string makeTarget = lg->GetMakefile()->GetStartOutputDirectory();
|
||||||
makeTarget += "/";
|
makeTarget += "/";
|
||||||
makeTarget += pass;
|
makeTarget += pass;
|
||||||
makeTarget = lg->Convert(makeTarget.c_str(),
|
|
||||||
cmLocalGenerator::HOME_OUTPUT,
|
|
||||||
cmLocalGenerator::MAKEFILE);
|
|
||||||
|
|
||||||
// The directory-level rule should depend on the target-level rules
|
// The directory-level rule should depend on the target-level rules
|
||||||
// for all targets in the directory.
|
// for all targets in the directory.
|
||||||
|
@ -502,9 +499,6 @@ cmGlobalUnixMakefileGenerator3
|
||||||
std::string subdir = slg->GetMakefile()->GetStartOutputDirectory();
|
std::string subdir = slg->GetMakefile()->GetStartOutputDirectory();
|
||||||
subdir += "/";
|
subdir += "/";
|
||||||
subdir += pass;
|
subdir += pass;
|
||||||
subdir = slg->Convert(subdir.c_str(),
|
|
||||||
cmLocalGenerator::HOME_OUTPUT,
|
|
||||||
cmLocalGenerator::MAKEFILE);
|
|
||||||
depends.push_back(subdir);
|
depends.push_back(subdir);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1465,10 +1465,11 @@ void cmLocalUnixMakefileGenerator3
|
||||||
std::vector<std::string> commands;
|
std::vector<std::string> commands;
|
||||||
|
|
||||||
// Write the all rule.
|
// Write the all rule.
|
||||||
std::string dir = this->Makefile->GetStartOutputDirectory();
|
std::string dir;
|
||||||
dir += "/all";
|
std::string recursiveTarget = this->Makefile->GetStartOutputDirectory();
|
||||||
|
recursiveTarget += "/all";
|
||||||
|
|
||||||
dir = this->Convert(dir.c_str(),HOME_OUTPUT,MAKEFILE);
|
dir = this->Convert(recursiveTarget.c_str(),HOME_OUTPUT,MAKEFILE);
|
||||||
|
|
||||||
depends.push_back("cmake_check_build_system");
|
depends.push_back("cmake_check_build_system");
|
||||||
|
|
||||||
|
@ -1487,7 +1488,7 @@ void cmLocalUnixMakefileGenerator3
|
||||||
std::string mf2Dir = cmake::GetCMakeFilesDirectoryPostSlash();
|
std::string mf2Dir = cmake::GetCMakeFilesDirectoryPostSlash();
|
||||||
mf2Dir += "Makefile2";
|
mf2Dir += "Makefile2";
|
||||||
commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
|
commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
|
||||||
dir.c_str()));
|
recursiveTarget.c_str()));
|
||||||
this->CreateCDCommand(commands,
|
this->CreateCDCommand(commands,
|
||||||
this->Makefile->GetHomeOutputDirectory(),
|
this->Makefile->GetHomeOutputDirectory(),
|
||||||
this->Makefile->GetStartOutputDirectory());
|
this->Makefile->GetStartOutputDirectory());
|
||||||
|
@ -1504,13 +1505,13 @@ void cmLocalUnixMakefileGenerator3
|
||||||
depends, commands, true);
|
depends, commands, true);
|
||||||
|
|
||||||
// Write the clean rule.
|
// Write the clean rule.
|
||||||
dir = this->Makefile->GetStartOutputDirectory();
|
recursiveTarget = this->Makefile->GetStartOutputDirectory();
|
||||||
dir += "/clean";
|
recursiveTarget += "/clean";
|
||||||
dir = this->Convert(dir.c_str(),HOME_OUTPUT,MAKEFILE);
|
dir = this->Convert(recursiveTarget.c_str(),HOME_OUTPUT,MAKEFILE);
|
||||||
commands.clear();
|
commands.clear();
|
||||||
depends.clear();
|
depends.clear();
|
||||||
commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
|
commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
|
||||||
dir.c_str()));
|
recursiveTarget.c_str()));
|
||||||
this->CreateCDCommand(commands,
|
this->CreateCDCommand(commands,
|
||||||
this->Makefile->GetHomeOutputDirectory(),
|
this->Makefile->GetHomeOutputDirectory(),
|
||||||
this->Makefile->GetStartOutputDirectory());
|
this->Makefile->GetStartOutputDirectory());
|
||||||
|
@ -1523,9 +1524,9 @@ void cmLocalUnixMakefileGenerator3
|
||||||
depends, commands, true);
|
depends, commands, true);
|
||||||
|
|
||||||
// Write the preinstall rule.
|
// Write the preinstall rule.
|
||||||
dir = this->Makefile->GetStartOutputDirectory();
|
recursiveTarget = this->Makefile->GetStartOutputDirectory();
|
||||||
dir += "/preinstall";
|
recursiveTarget += "/preinstall";
|
||||||
dir = this->Convert(dir.c_str(), HOME_OUTPUT,MAKEFILE);
|
dir = this->Convert(recursiveTarget.c_str(), HOME_OUTPUT,MAKEFILE);
|
||||||
commands.clear();
|
commands.clear();
|
||||||
depends.clear();
|
depends.clear();
|
||||||
const char* noall =
|
const char* noall =
|
||||||
|
@ -1541,7 +1542,7 @@ void cmLocalUnixMakefileGenerator3
|
||||||
depends.push_back("cmake_check_build_system");
|
depends.push_back("cmake_check_build_system");
|
||||||
}
|
}
|
||||||
commands.push_back
|
commands.push_back
|
||||||
(this->GetRecursiveMakeCall(mf2Dir.c_str(), dir.c_str()));
|
(this->GetRecursiveMakeCall(mf2Dir.c_str(), recursiveTarget.c_str()));
|
||||||
this->CreateCDCommand(commands,
|
this->CreateCDCommand(commands,
|
||||||
this->Makefile->GetHomeOutputDirectory(),
|
this->Makefile->GetHomeOutputDirectory(),
|
||||||
this->Makefile->GetStartOutputDirectory());
|
this->Makefile->GetStartOutputDirectory());
|
||||||
|
|
Loading…
Reference in New Issue