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

Merge topic 'fix-12441-show-custom-target-progress' 

7ab1162 CMake: Fix progress reporting for custom targets (#12441)
This commit is contained in:
David Cole 2011-12-16 10:14:52 -05:00 committed by CMake Topic Stage
parent c6c82f9e3e 7ab1162eaa
commit be637d7a92
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmMakefileUtilityTargetGenerator.cxx
View File

@ -34,6 +34,20 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
*this->BuildFileStream *this->BuildFileStream
<< "# Utility rule file for " << this->Target->GetName() << ".\n\n"; << "# Utility rule file for " << this->Target->GetName() << ".\n\n";
if(!this->NoRuleMessages)
{
const char* root = (this->Makefile->IsOn("CMAKE_MAKE_INCLUDE_FROM_ROOT")?
"$(CMAKE_BINARY_DIR)/" : "");
// Include the progress variables for the target.
*this->BuildFileStream
<< "# Include the progress variables for this target.\n"
<< this->LocalGenerator->IncludeDirective << " " << root
<< this->Convert(this->ProgressFileNameFull.c_str(),
cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE)
<< "\n\n";
}
// write the custom commands for this target // write the custom commands for this target
this->WriteTargetBuildRules(); this->WriteTargetBuildRules();