Skip to content
Snippets Groups Projects
Commit 94847d0a authored by Ken Martin's avatar Ken Martin
Browse files

BUG#891: When building CMake itself, use the new cmake to install so that the...

BUG#891: When building CMake itself, use the new cmake to install so that the current cmake can be overwritten.
parent 4b55ff77
No related branches found
No related tags found
No related merge requests found
......@@ -2692,8 +2692,21 @@ void cmLocalUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
"",
cmd.c_str());
}
this->OutputMakeRule(fout, "installation", "install", "",
"$(CMAKE_COMMAND) -P cmake_install.cmake");
if(m_Makefile->GetDefinition("CMake_BINARY_DIR"))
{
// We are building CMake itself. We cannot use the original
// executable to install over itself.
std::string rule = m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH");
rule += "/cmake";
rule = cmSystemTools::ConvertToOutputPath(rule.c_str());
rule += " -P cmake_install.cmake";
this->OutputMakeRule(fout, "installation", "install", "", rule.c_str());
}
else
{
this->OutputMakeRule(fout, "installation", "install", "",
"$(CMAKE_COMMAND) -P cmake_install.cmake");
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment