kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Ken Martin 2004-06-09 18:56:00 -04:00
parent 4b55ff7749
commit 94847d0aa7
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -2692,8 +2692,21 @@ void cmLocalUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
"", "",
cmd.c_str()); cmd.c_str());
} }
this->OutputMakeRule(fout, "installation", "install", "", if(m_Makefile->GetDefinition("CMake_BINARY_DIR"))
"$(CMAKE_COMMAND) -P cmake_install.cmake"); {
// 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");
}
} }