diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-15 13:05:51 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-07-15 13:05:51 (GMT) |
| commit | 77fa27a9f5875334a11caf2cbbb3790edc836095 (patch) | |
| tree | 09487c98fc0b80f65c61bbca02c1048f37aeb1a9 /Source | |
| parent | 5bd01a4b695e68efb5e6c91fb726d160ef911aec (diff) | |
| parent | f0cad1939f10ccdcf1b5e8ad150b7e10471f92a3 (diff) | |
| download | CMake-77fa27a9f5875334a11caf2cbbb3790edc836095.zip CMake-77fa27a9f5875334a11caf2cbbb3790edc836095.tar.gz CMake-77fa27a9f5875334a11caf2cbbb3790edc836095.tar.bz2 | |
Merge topic 'makefile-target-messages'
f0cad193 Tests: Add test for TARGET_MESSAGES global property
1d398478 Makefile: Optionally disable target completion messages in build output
d560b46f CMakeGenericSystem: Recognize Watcom WMake generator as Makefile generator
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index c5fca91..edf2705 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -801,8 +801,20 @@ cmGlobalUnixMakefileGenerator3 } progress.Arg = progressArg.str(); } - lg->AppendEcho(commands, "Built target " + name, - cmLocalUnixMakefileGenerator3::EchoNormal, &progress); + + bool targetMessages = true; + if (const char* tgtMsg = this->GetCMakeInstance() + ->GetState() + ->GetGlobalProperty("TARGET_MESSAGES")) + { + targetMessages = cmSystemTools::IsOn(tgtMsg); + } + + if (targetMessages) + { + lg->AppendEcho(commands, "Built target " + name, + cmLocalUnixMakefileGenerator3::EchoNormal, &progress); + } this->AppendGlobalTargetDepends(depends, gtarget); lg->WriteMakeRule(ruleFileStream, "All Build rule for target.", |