[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-677-gbbc1ed0

[Daniel Pfeifer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  bbc1ed0b6f8669912dbf7151d3c46fa806e04a67 (commit)
       via  3aa68a0197e510372c26152d4bbf9a1066b082d3 (commit)
       via  f01ee88d0040b4905844af32d10a689d8ccfc672 (commit)
      from  797b4d3a176c01c91b040ac4fc1e787796e62deb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bbc1ed0b6f8669912dbf7151d3c46fa806e04a67
commit bbc1ed0b6f8669912dbf7151d3c46fa806e04a67
Merge: 797b4d3 3aa68a0
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun Oct 23 04:06:32 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Oct 23 04:06:32 2016 -0400

    Merge topic 'cmcommand-no-disable' into next
    
    3aa68a01 Merge topic 'separate-compilation' into cmcommand-no-disable
    f01ee88d Remove cmCommand::Enabled and all related accessors

diff --cc Source/cmCommand.h
index 6a1979a,5adca64..dcfe8da
--- a/Source/cmCommand.h
+++ b/Source/cmCommand.h
@@@ -17,11 -19,13 +17,11 @@@
   * to support such features as enable/disable, inheritance,
   * documentation, and construction.
   */
 -class cmCommand : public cmObject
 +class cmCommand
  {
  public:
 -  cmTypeMacro(cmCommand, cmObject);
 -
    /**
-    * Construct the command. By default it is enabled with no makefile.
+    * Construct the command. By default it has no makefile.
     */
    cmCommand()
      : Makefile(CM_NULLPTR)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3aa68a0197e510372c26152d4bbf9a1066b082d3
commit 3aa68a0197e510372c26152d4bbf9a1066b082d3
Merge: f01ee88 32040cd
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun Oct 23 10:06:00 2016 +0200
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Sun Oct 23 10:06:00 2016 +0200

    Merge topic 'separate-compilation' into cmcommand-no-disable

diff --cc Source/cmCommand.h
index cc34756,9299c71..5adca64
--- a/Source/cmCommand.h
+++ b/Source/cmCommand.h
@@@ -104,16 -96,29 +95,9 @@@ public
    virtual std::string GetName() const = 0;
  
    /**
 -   * Enable the command.
 -   */
 -  void EnabledOn() { this->Enabled = true; }
 -
 -  /**
 -   * Disable the command.
 -   */
 -  void EnabledOff() { this->Enabled = false; }
 -
 -  /**
 -   * Query whether the command is enabled.
 -   */
 -  bool GetEnabled() const { return this->Enabled; }
 -
 -  /**
 -   * Disable or enable the command.
 -   */
 -  void SetEnabled(bool enabled) { this->Enabled = enabled; }
 -
 -  /**
     * Return the last error string.
     */
-   const char* GetError()
-   {
-     if (this->Error.empty()) {
-       this->Error = this->GetName();
-       this->Error += " unknown error.";
-     }
-     return this->Error.c_str();
-   }
+   const char* GetError();
  
    /**
     * Set the error message

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f01ee88d0040b4905844af32d10a689d8ccfc672
commit f01ee88d0040b4905844af32d10a689d8ccfc672
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun Oct 23 08:55:19 2016 +0200
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Sun Oct 23 08:55:19 2016 +0200

    Remove cmCommand::Enabled and all related accessors
    
    Enabled is never set to false.  Remove the member variable and all
    related getters and setters.

diff --git a/Source/cmCommand.h b/Source/cmCommand.h
index d8e337d..cc34756 100644
--- a/Source/cmCommand.h
+++ b/Source/cmCommand.h
@@ -25,12 +25,11 @@ public:
   cmTypeMacro(cmCommand, cmObject);
 
   /**
-   * Construct the command. By default it is enabled with no makefile.
+   * Construct the command. By default it has no makefile.
    */
   cmCommand()
+    : Makefile(CM_NULLPTR)
   {
-    this->Makefile = CM_NULLPTR;
-    this->Enabled = true;
   }
 
   /**
@@ -105,26 +104,6 @@ public:
   virtual std::string GetName() const = 0;
 
   /**
-   * Enable the command.
-   */
-  void EnabledOn() { this->Enabled = true; }
-
-  /**
-   * Disable the command.
-   */
-  void EnabledOff() { this->Enabled = false; }
-
-  /**
-   * Query whether the command is enabled.
-   */
-  bool GetEnabled() const { return this->Enabled; }
-
-  /**
-   * Disable or enable the command.
-   */
-  void SetEnabled(bool enabled) { this->Enabled = enabled; }
-
-  /**
    * Return the last error string.
    */
   const char* GetError()
@@ -169,7 +148,6 @@ protected:
   cmCommandArgumentsHelper Helper;
 
 private:
-  bool Enabled;
   std::string Error;
 };
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 00c0e82..741ffb8 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -266,7 +266,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
     pcmd->SetMakefile(this);
 
     // Decide whether to invoke the command.
-    if (pcmd->GetEnabled() && !cmSystemTools::GetFatalErrorOccured() &&
+    if (!cmSystemTools::GetFatalErrorOccured() &&
         (this->GetCMakeInstance()->GetWorkingMode() != cmake::SCRIPT_MODE ||
          pcmd->IsScriptable()))
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommand.h    |   24 +-----------------------
 Source/cmMakefile.cxx |    2 +-
 2 files changed, 2 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
CMake