summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalUnixMakefileGenerator3.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.cxx12
1 files changed, 10 insertions, 2 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index a0ff5dc..853a4f3 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -161,8 +161,10 @@ void cmLocalUnixMakefileGenerator3
void cmLocalUnixMakefileGenerator3::WriteAllProgressVariable()
{
// write the top level progress for the all target
+ std::string progressFile = cmake::GetCMakeFilesDirectory();
+ progressFile += "/progress.make";
std::string progressFileNameFull =
- this->ConvertToFullPath("progress.make");
+ this->ConvertToFullPath(progressFile.c_str());
cmGeneratedFileStream ruleFileStream(progressFileNameFull.c_str());
if(!ruleFileStream)
{
@@ -1395,10 +1397,16 @@ void cmLocalUnixMakefileGenerator3
this->WriteSpecialTargetsTop(ruleFileStream);
// Include the progress variables for the target.
+ std::string progressFile = cmake::GetCMakeFilesDirectory();
+ progressFile += "/progress.make";
+ std::string progressFileNameFull =
+ this->ConvertToFullPath(progressFile.c_str());
ruleFileStream
<< "# Include the progress variables for this target.\n"
<< this->IncludeDirective << " "
- << "progress.make\n\n";
+ << this->Convert(progressFileNameFull.c_str(),
+ cmLocalGenerator::HOME_OUTPUT,
+ cmLocalGenerator::MAKEFILE) << "\n\n";
// Write all global targets
this->WriteDivider(ruleFileStream);