summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-10-15 14:40:57 (GMT)
committerBrad King <brad.king@kitware.com>2008-10-15 14:40:57 (GMT)
commit690121f09829a93b815bfb949115fc33f5e4a175 (patch)
treed92f9c2e25abdc69369765c01bcfe91700e4376a /Source
parent9c29a72fbc6f52f9e2ac558811b74490355329d3 (diff)
downloadCMake-690121f09829a93b815bfb949115fc33f5e4a175.zip
CMake-690121f09829a93b815bfb949115fc33f5e4a175.tar.gz
CMake-690121f09829a93b815bfb949115fc33f5e4a175.tar.bz2
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')
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.h3
-rw-r--r--Source/cmMakefileTargetGenerator.cxx7
2 files changed, 8 insertions, 2 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 220aaa8..ebb7c79 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -193,6 +193,9 @@ public:
void AppendEcho(std::vector<std::string>& commands, const char* text,
EchoColor color = EchoNormal);
+ /** Get whether the makefile is to have color. */
+ bool GetColorMakefile() const { return this->ColorMakefile; }
+
virtual std::string GetTargetDirectory(cmTarget const& target) const;
// create a command that cds to the start dir then runs the commands
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 41e3612..e19cd1d 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.