[Cmake-commits] CMake branch, master, updated. v3.7.0-rc2-296-g9a901dc
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, master has been updated via 9a901dc78de32519dae234719370b5330d5564b4 (commit) from aae5a9feb1b07bfae6968f2dfb3b3057a04b3c89 (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=9a901dc78de32519dae234719370b5330d5564b4 commit 9a901dc78de32519dae234719370b5330d5564b4 Author: Kitware Robot AuthorDate: Mon Oct 24 00:01:13 2016 -0400 Commit: Kitware Robot CommitDate: Mon Oct 24 00:01:13 2016 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 5b0d435..a2acd97 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 7) -set(CMake_VERSION_PATCH 20161023) +set(CMake_VERSION_PATCH 20161024) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-679-ge640244
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 e6402444f1f837efb452c50c106a738a66b59d48 (commit) via 645186c0b7e46cf99882616ef2a00f07a472825c (commit) from bbc1ed0b6f8669912dbf7151d3c46fa806e04a67 (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=e6402444f1f837efb452c50c106a738a66b59d48 commit e6402444f1f837efb452c50c106a738a66b59d48 Merge: bbc1ed0 645186c Author: Daniel Pfeifer AuthorDate: Sun Oct 23 04:25:57 2016 -0400 Commit: CMake Topic Stage CommitDate: Sun Oct 23 04:25:57 2016 -0400 Merge topic 'remove-cmobject' into next 645186c0 Revert "Remove cmObject.h and cmTypeMacro.h" https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=645186c0b7e46cf99882616ef2a00f07a472825c commit 645186c0b7e46cf99882616ef2a00f07a472825c Author: Daniel Pfeifer AuthorDate: Sun Oct 23 10:25:23 2016 +0200 Commit: Daniel Pfeifer CommitDate: Sun Oct 23 10:25:23 2016 +0200 Revert "Remove cmObject.h and cmTypeMacro.h" This reverts commit dcb8b0fb35e74749d07b8aec837b41564691f0c7. diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.h b/Source/CPack/IFW/cmCPackIFWGenerator.h index d656063..88a3741 100644 --- a/Source/CPack/IFW/cmCPackIFWGenerator.h +++ b/Source/CPack/IFW/cmCPackIFWGenerator.h @@ -10,6 +10,7 @@ #include "cmCPackIFWInstaller.h" #include "cmCPackIFWPackage.h" #include "cmCPackIFWRepository.h" +#include "cmTypeMacro.h" #include #include diff --git a/Source/CPack/cmCPack7zGenerator.h b/Source/CPack/cmCPack7zGenerator.h index a617d9b..063b032 100644 --- a/Source/CPack/cmCPack7zGenerator.h +++ b/Source/CPack/cmCPack7zGenerator.h @@ -7,6 +7,7 @@ #include "cmCPackArchiveGenerator.h" #include "cmCPackGenerator.h" +#include "cmTypeMacro.h" /** \class cmCPack7zGenerator * \brief A generator for 7z files diff --git a/Source/CPack/cmCPackArchiveGenerator.h b/Source/CPack/cmCPackArchiveGenerator.h index df02ae8..7010664 100644 --- a/Source/CPack/cmCPackArchiveGenerator.h +++ b/Source/CPack/cmCPackArchiveGenerator.h @@ -7,6 +7,7 @@ #include "cmArchiveWrite.h" #include "cmCPackGenerator.h" +#include "cmTypeMacro.h" #include #include diff --git a/Source/CPack/cmCPackDebGenerator.h b/Source/CPack/cmCPackDebGenerator.h index 7db933e..f46ae5a 100644 --- a/Source/CPack/cmCPackDebGenerator.h +++ b/Source/CPack/cmCPackDebGenerator.h @@ -6,6 +6,7 @@ #include #include "cmCPackGenerator.h" +#include "cmTypeMacro.h" #include #include diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h index f32dd70..a7652b1 100644 --- a/Source/CPack/cmCPackGenerator.h +++ b/Source/CPack/cmCPackGenerator.h @@ -6,7 +6,9 @@ #include #include "cmCPackComponentGroup.h" +#include "cmObject.h" #include "cmSystemTools.h" +#include "cmTypeMacro.h" #include #include diff --git a/Source/CPack/cmCPackGeneratorFactory.h b/Source/CPack/cmCPackGeneratorFactory.h index 0a98f91..5381eb2 100644 --- a/Source/CPack/cmCPackGeneratorFactory.h +++ b/Source/CPack/cmCPackGeneratorFactory.h @@ -5,6 +5,9 @@ #include +#include "cmObject.h" +#include "cmTypeMacro.h" + #include #include #include diff --git a/Source/CPack/cmCPackLog.h b/Source/CPack/cmCPackLog.h index 9ffe5c4..2ac805d 100644 --- a/Source/CPack/cmCPackLog.h +++ b/Source/CPack/cmCPackLog.h @@ -5,6 +5,9 @@ #include +#include "cmObject.h" +#include "cmTypeMacro.h" + #include #include #include diff --git a/Source/CPack/cmCPackNSISGenerator.h b/Source/CPack/cmCPackNSISGenerator.h index b4bf2d4..d61341c 100644 --- a/Source/CPack/cmCPackNSISGenerator.h +++ b/Source/CPack/cmCPackNSISGenerator.h @@ -6,6 +6,7 @@ #include #include "cmCPackGenerator.h" +#include "cmTypeMacro.h" #include #include diff --git a/Source/CPack/cmCPackPKGGenerator.h b/Source/CPack/cmCPackPKGGenerator.h index bb3c1a7..5569185 100644 --- a/Source/CPack/cmCPackPKGGenerator.h +++ b/Source/CPack/cmCPackPKGGenerator.h @@ -3,9 +3,6 @@ #ifndef cmCPackPKGGenerator_h #define cmCPackPKGGenerator_h -#include -#include - #include "cmCPackGenerator.h" class cmCPackComponent; diff --git a/Source/CPack/cmCPackRPMGenerator.h b/Source/CPack/cmCPackRPMGenerator.h index 4d48bd8..f8bcbfe 100644 --- a/Source/CPack/cmCPackRPMGenerator.h +++ b/Source/CPack/cmCPackRPMGenerator.h @@ -6,6 +6,7 @@ #include #include "cmCPackGenerator.h" +#include "cmTypeMacro.h" #include diff --git a/Source/CPack/cmCPackSTGZGenerator.h b/Source/CPack/cmCPackSTGZGenerator.h index 4b9c1c6..a1bee5f 100644 --- a/Source/CPack/cmCPackSTGZGenerator.h +++ b/Source/CPack/cmCPackSTGZGenerator.h @@ -7,6 +7,7 @@ #i
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-677-gbbc1ed0
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
AuthorDate: Sun Oct 23 04:06:32 2016 -0400
Commit: CMake Topic Stage
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
AuthorDate: Sun Oct 23 10:06:00 2016 +0200
Commit: Daniel Pfeifer
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
AuthorDate: Sun Oct 23 08:55:19 2016 +0200
Commit: Daniel Pfeifer
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::G
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-674-g797b4d3
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 797b4d3a176c01c91b040ac4fc1e787796e62deb (commit) via dcb8b0fb35e74749d07b8aec837b41564691f0c7 (commit) via 2214011f7b3b13fe7ae0f68f0f9d49af11e12edd (commit) via 7f9a8d53aa8a3595f4f1f2f81607f8df3627642d (commit) via fb0b087c4dc65f18aef431e41de3aa9b91e35371 (commit) via 2169b0faa40a20cd9aae25f9170cca074579a023 (commit) via 9855ebf11a1556bd0b73a1eaec39232842871528 (commit) from a8102f933066923c47ed35e0125a5c2e0940a4e8 (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=797b4d3a176c01c91b040ac4fc1e787796e62deb commit 797b4d3a176c01c91b040ac4fc1e787796e62deb Merge: a8102f9 dcb8b0f Author: Daniel Pfeifer AuthorDate: Sun Oct 23 04:02:55 2016 -0400 Commit: CMake Topic Stage CommitDate: Sun Oct 23 04:02:55 2016 -0400 Merge topic 'remove-cmobject' into next dcb8b0fb Remove cmObject.h and cmTypeMacro.h 2214011f Make cmCPackGenerator not inherit from cmObject 7f9a8d53 Make cmCPackGeneratorFactory not inherit from cmObject fb0b087c Make cmCTestGenericHandler not inherit from cmObject 2169b0fa Make cmCPackLog not inherit from cmObject 9855ebf1 Make cmCommand not inherit from cmObject https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcb8b0fb35e74749d07b8aec837b41564691f0c7 commit dcb8b0fb35e74749d07b8aec837b41564691f0c7 Author: Daniel Pfeifer AuthorDate: Sun Oct 23 01:19:00 2016 +0200 Commit: Daniel Pfeifer CommitDate: Sun Oct 23 08:02:33 2016 +0200 Remove cmObject.h and cmTypeMacro.h diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.h b/Source/CPack/IFW/cmCPackIFWGenerator.h index 88a3741..d656063 100644 --- a/Source/CPack/IFW/cmCPackIFWGenerator.h +++ b/Source/CPack/IFW/cmCPackIFWGenerator.h @@ -10,7 +10,6 @@ #include "cmCPackIFWInstaller.h" #include "cmCPackIFWPackage.h" #include "cmCPackIFWRepository.h" -#include "cmTypeMacro.h" #include #include diff --git a/Source/CPack/cmCPack7zGenerator.h b/Source/CPack/cmCPack7zGenerator.h index 063b032..a617d9b 100644 --- a/Source/CPack/cmCPack7zGenerator.h +++ b/Source/CPack/cmCPack7zGenerator.h @@ -7,7 +7,6 @@ #include "cmCPackArchiveGenerator.h" #include "cmCPackGenerator.h" -#include "cmTypeMacro.h" /** \class cmCPack7zGenerator * \brief A generator for 7z files diff --git a/Source/CPack/cmCPackArchiveGenerator.h b/Source/CPack/cmCPackArchiveGenerator.h index 7010664..df02ae8 100644 --- a/Source/CPack/cmCPackArchiveGenerator.h +++ b/Source/CPack/cmCPackArchiveGenerator.h @@ -7,7 +7,6 @@ #include "cmArchiveWrite.h" #include "cmCPackGenerator.h" -#include "cmTypeMacro.h" #include #include diff --git a/Source/CPack/cmCPackDebGenerator.h b/Source/CPack/cmCPackDebGenerator.h index f46ae5a..7db933e 100644 --- a/Source/CPack/cmCPackDebGenerator.h +++ b/Source/CPack/cmCPackDebGenerator.h @@ -6,7 +6,6 @@ #include #include "cmCPackGenerator.h" -#include "cmTypeMacro.h" #include #include diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h index a7652b1..f32dd70 100644 --- a/Source/CPack/cmCPackGenerator.h +++ b/Source/CPack/cmCPackGenerator.h @@ -6,9 +6,7 @@ #include #include "cmCPackComponentGroup.h" -#include "cmObject.h" #include "cmSystemTools.h" -#include "cmTypeMacro.h" #include #include diff --git a/Source/CPack/cmCPackGeneratorFactory.h b/Source/CPack/cmCPackGeneratorFactory.h index 5381eb2..0a98f91 100644 --- a/Source/CPack/cmCPackGeneratorFactory.h +++ b/Source/CPack/cmCPackGeneratorFactory.h @@ -5,9 +5,6 @@ #include -#include "cmObject.h" -#include "cmTypeMacro.h" - #include #include #include diff --git a/Source/CPack/cmCPackLog.h b/Source/CPack/cmCPackLog.h index 2ac805d..9ffe5c4 100644 --- a/Source/CPack/cmCPackLog.h +++ b/Source/CPack/cmCPackLog.h @@ -5,9 +5,6 @@ #include -#include "cmObject.h" -#include "cmTypeMacro.h" - #include #include #include diff --git a/Source/CPack/cmCPackNSISGenerator.h b/Source/CPack/cmCPackNSISGenerator.h index d61341c..b4bf2d4 100644 --- a/Source/CPack/cmCPackNSISGenerator.h +++ b/Source/CPack/cmCPackNSISGenerator.h @@ -6,7 +6,6 @@ #include #include "cmCPackGenerator.h" -#include "cmTypeMacro.h" #include #include diff --git a/Source/CPack/cmCPackPKGGenerator.h b/Source/CPack/cmCPackPKGGenerator.h index 5569185..bb3c1a7 100644 --- a/Source/CPack/cmCPackPKGGenerator.h +++ b/Source/CPack/cmCPackPKGGenerator.h @@ -3,6 +3,9 @@ #ifndef cmCPackPKGGenerator_h #define cmCPackPKGGenerator_h +#include +#include + #include "cmCPackGenerator.h" class cmCPackComponen
