Commit 3f011158 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: merge changes from main trunk

parent 4bf136ff
...@@ -51,18 +51,6 @@ public: ...@@ -51,18 +51,6 @@ public:
virtual void Generate(); virtual void Generate();
// this returns the relative path between the HomeOutputDirectory and this // this returns the relative path between the HomeOutputDirectory and this
// local generators StartOutputDirectory // local generators StartOutputDirectory
const std::string &GetHomeRelativeOutputPath(); const std::string &GetHomeRelativeOutputPath();
...@@ -135,6 +123,15 @@ public: ...@@ -135,6 +123,15 @@ public:
*/ */
void SetSilentNoColon(bool v) {this->SilentNoColon = v;} void SetSilentNoColon(bool v) {this->SilentNoColon = v;}
/**
* If set to true, the CMake variable CMAKE_VERBOSE_MAKEFILES doesn't have
* anymore. Set it to true when writing a generator where short output
* doesn't make sense, e.g. because the full output is parsed by an
* IDE/editor.
*/
void SetForceVerboseMakefiles(bool enable)
{this->ForceVerboseMakefiles=enable;}
/** /**
* Set the command to use for native make shell echo. The value * Set the command to use for native make shell echo. The value
* should include all parts of the command up to the beginning of * should include all parts of the command up to the beginning of
...@@ -267,19 +264,6 @@ protected: ...@@ -267,19 +264,6 @@ protected:
void WriteDirectoryInformationFile(); void WriteDirectoryInformationFile();
// write the depend info // write the depend info
void WriteDependLanguageInfo(std::ostream& cmakefileStream, cmTarget &tgt); void WriteDependLanguageInfo(std::ostream& cmakefileStream, cmTarget &tgt);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment