diff options
| author | Brad King <brad.king@kitware.com> | 2008-10-15 10:40:57 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-10-15 10:40:57 -0400 |
| commit | 690121f09829a93b815bfb949115fc33f5e4a175 (patch) | |
| tree | d92f9c2e25abdc69369765c01bcfe91700e4376a /Source/cmMakefileTargetGenerator.cxx | |
| parent | 9c29a72fbc6f52f9e2ac558811b74490355329d3 (diff) | |
| download | cmake-690121f09829a93b815bfb949115fc33f5e4a175.tar.gz | |
BUG: Fix color check for dependency scanning
Generation of color rules for dependency scanning messages did not
account for disabling color at generation time. See issue #7814.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 41e3612dcf..e19cd1dd00 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1031,8 +1031,11 @@ void cmMakefileTargetGenerator::WriteTargetDependRules() cmLocalGenerator::FULL, cmLocalGenerator::SHELL) << " " << this->Convert(this->InfoFileNameFull.c_str(), - cmLocalGenerator::FULL, cmLocalGenerator::SHELL) - << " --color=$(COLOR)"; + cmLocalGenerator::FULL, cmLocalGenerator::SHELL); + if(this->LocalGenerator->GetColorMakefile()) + { + depCmd << " --color=$(COLOR)"; + } commands.push_back(depCmd.str()); // Make sure all custom command outputs in this target are built. |