diff options
| author | David Cole <david.cole@kitware.com> | 2011-12-16 15:14:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-12-16 15:14:52 (GMT) |
| commit | be637d7a92ca20c18a66562d650b307e21eeffa4 (patch) | |
| tree | 1c7d8e5ad10ce3283d264c5c610b5c7450160f75 /Source | |
| parent | c6c82f9e3e921a3988a2e8b4012e3942fa22db40 (diff) | |
| parent | 7ab1162eaa1490be745f2b2a24ba7b4a3ec69112 (diff) | |
| download | CMake-be637d7a92ca20c18a66562d650b307e21eeffa4.zip CMake-be637d7a92ca20c18a66562d650b307e21eeffa4.tar.gz CMake-be637d7a92ca20c18a66562d650b307e21eeffa4.tar.bz2 | |
Merge topic 'fix-12441-show-custom-target-progress'
7ab1162 CMake: Fix progress reporting for custom targets (#12441)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefileUtilityTargetGenerator.cxx | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Source/cmMakefileUtilityTargetGenerator.cxx b/Source/cmMakefileUtilityTargetGenerator.cxx index f52f7ab..a82c503 100644 --- a/Source/cmMakefileUtilityTargetGenerator.cxx +++ b/Source/cmMakefileUtilityTargetGenerator.cxx @@ -34,6 +34,20 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles() *this->BuildFileStream << "# 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 this->WriteTargetBuildRules(); |