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

BUG: Moved progress.make file into CMakeFiles subdirectory to keep things clean.

This commit is contained in:
Brad King 2006-09-28 17:21:50 -04:00
parent 9a1d4e92eb
commit bd6aaef001
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -161,8 +161,10 @@ void cmLocalUnixMakefileGenerator3
void cmLocalUnixMakefileGenerator3::WriteAllProgressVariable() void cmLocalUnixMakefileGenerator3::WriteAllProgressVariable()
{ {
// write the top level progress for the all target // write the top level progress for the all target
std::string progressFile = cmake::GetCMakeFilesDirectory();
progressFile += "/progress.make";
std::string progressFileNameFull = std::string progressFileNameFull =
this->ConvertToFullPath("progress.make"); this->ConvertToFullPath(progressFile.c_str());
cmGeneratedFileStream ruleFileStream(progressFileNameFull.c_str()); cmGeneratedFileStream ruleFileStream(progressFileNameFull.c_str());
if(!ruleFileStream) if(!ruleFileStream)
{ {
@ -1395,10 +1397,16 @@ void cmLocalUnixMakefileGenerator3
this->WriteSpecialTargetsTop(ruleFileStream); this->WriteSpecialTargetsTop(ruleFileStream);
// Include the progress variables for the target. // Include the progress variables for the target.
std::string progressFile = cmake::GetCMakeFilesDirectory();
progressFile += "/progress.make";
std::string progressFileNameFull =
this->ConvertToFullPath(progressFile.c_str());
ruleFileStream ruleFileStream
<< "# Include the progress variables for this target.\n" << "# Include the progress variables for this target.\n"
<< this->IncludeDirective << " " << this->IncludeDirective << " "
<< "progress.make\n\n"; << this->Convert(progressFileNameFull.c_str(),
cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE) << "\n\n";
// Write all global targets // Write all global targets
this->WriteDivider(ruleFileStream); this->WriteDivider(ruleFileStream);