[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-725-g2b3a600
Daniel Pfeifer
daniel at pfeifer-mail.de
Mon Oct 24 15:51:00 EDT 2016
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 2b3a600e8570df998247ed89da75522cb97e8563 (commit)
via 15aa814b85a90fb8e8798eb99617d27957c28f36 (commit)
from 08714bc5fcc28cc8e66faa6bd6f06c9a1c1b7cc2 (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=2b3a600e8570df998247ed89da75522cb97e8563
commit 2b3a600e8570df998247ed89da75522cb97e8563
Merge: 08714bc 15aa814
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Mon Oct 24 15:50:58 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 24 15:50:58 2016 -0400
Merge topic 'remove-cmobject' into next
15aa814b Remove cmObject.h and cmTypeMacro.h
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15aa814b85a90fb8e8798eb99617d27957c28f36
commit 15aa814b85a90fb8e8798eb99617d27957c28f36
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun Oct 23 01:19:00 2016 +0200
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Mon Oct 24 21:49:28 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 <map>
#include <set>
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 <iosfwd>
#include <string>
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 <cmConfigure.h>
#include "cmCPackGenerator.h"
-#include "cmTypeMacro.h"
#include <string>
#include <vector>
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 <cmConfigure.h>
#include "cmCPackComponentGroup.h"
-#include "cmObject.h"
#include "cmSystemTools.h"
-#include "cmTypeMacro.h"
#include <map>
#include <sstream>
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 <cmConfigure.h>
-#include "cmObject.h"
-#include "cmTypeMacro.h"
-
#include <map>
#include <string>
#include <vector>
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 <cmConfigure.h>
-#include "cmObject.h"
-#include "cmTypeMacro.h"
-
#include <ostream>
#include <string.h>
#include <string>
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 <cmConfigure.h>
#include "cmCPackGenerator.h"
-#include "cmTypeMacro.h"
#include <iosfwd>
#include <set>
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 <cmConfigure.h>
+#include <set>
+
#include "cmCPackGenerator.h"
class cmCPackComponent;
diff --git a/Source/CPack/cmCPackRPMGenerator.h b/Source/CPack/cmCPackRPMGenerator.h
index f8bcbfe..4d48bd8 100644
--- a/Source/CPack/cmCPackRPMGenerator.h
+++ b/Source/CPack/cmCPackRPMGenerator.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCPackGenerator.h"
-#include "cmTypeMacro.h"
#include <string>
diff --git a/Source/CPack/cmCPackSTGZGenerator.h b/Source/CPack/cmCPackSTGZGenerator.h
index a1bee5f..4b9c1c6 100644
--- a/Source/CPack/cmCPackSTGZGenerator.h
+++ b/Source/CPack/cmCPackSTGZGenerator.h
@@ -7,7 +7,6 @@
#include "cmCPackGenerator.h"
#include "cmCPackTGZGenerator.h"
-#include "cmTypeMacro.h"
#include <iosfwd>
diff --git a/Source/CPack/cmCPackTGZGenerator.h b/Source/CPack/cmCPackTGZGenerator.h
index e93fb44..ee2e975 100644
--- a/Source/CPack/cmCPackTGZGenerator.h
+++ b/Source/CPack/cmCPackTGZGenerator.h
@@ -7,7 +7,6 @@
#include "cmCPackArchiveGenerator.h"
#include "cmCPackGenerator.h"
-#include "cmTypeMacro.h"
/** \class cmCPackTGZGenerator
* \brief A generator for TGZ files
diff --git a/Source/CPack/cmCPackTXZGenerator.h b/Source/CPack/cmCPackTXZGenerator.h
index b8a7597..876ca7d 100644
--- a/Source/CPack/cmCPackTXZGenerator.h
+++ b/Source/CPack/cmCPackTXZGenerator.h
@@ -7,7 +7,6 @@
#include "cmCPackArchiveGenerator.h"
#include "cmCPackGenerator.h"
-#include "cmTypeMacro.h"
/** \class cmCPackTXZGenerator
* \brief A generator for TXZ files
diff --git a/Source/CPack/cmCPackTarBZip2Generator.h b/Source/CPack/cmCPackTarBZip2Generator.h
index 2e8ba9b..42214fd 100644
--- a/Source/CPack/cmCPackTarBZip2Generator.h
+++ b/Source/CPack/cmCPackTarBZip2Generator.h
@@ -7,7 +7,6 @@
#include "cmCPackArchiveGenerator.h"
#include "cmCPackGenerator.h"
-#include "cmTypeMacro.h"
/** \class cmCPackTarBZip2Generator
* \brief A generator for TarBZip2 files
diff --git a/Source/CPack/cmCPackTarCompressGenerator.h b/Source/CPack/cmCPackTarCompressGenerator.h
index 7d253e1..1476642 100644
--- a/Source/CPack/cmCPackTarCompressGenerator.h
+++ b/Source/CPack/cmCPackTarCompressGenerator.h
@@ -7,7 +7,6 @@
#include "cmCPackArchiveGenerator.h"
#include "cmCPackGenerator.h"
-#include "cmTypeMacro.h"
/** \class cmCPackTarCompressGenerator
* \brief A generator for TarCompress files
diff --git a/Source/CPack/cmCPackZIPGenerator.h b/Source/CPack/cmCPackZIPGenerator.h
index e0334fb..95b6489 100644
--- a/Source/CPack/cmCPackZIPGenerator.h
+++ b/Source/CPack/cmCPackZIPGenerator.h
@@ -7,7 +7,6 @@
#include "cmCPackArchiveGenerator.h"
#include "cmCPackGenerator.h"
-#include "cmTypeMacro.h"
/** \class cmCPackZIPGenerator
* \brief A generator for ZIP files
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index c305cbf..b06bd38 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -12,7 +12,6 @@
#include "cmState.h"
#include "cmStateTypes.h"
#include "cmSystemTools.h"
-#include "cmTypeMacro.h"
#include "cm_auto_ptr.hxx"
#include "cmake.h"
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.h b/Source/CTest/cmCTestBuildAndTestHandler.h
index 1d424f3..5885738 100644
--- a/Source/CTest/cmCTestBuildAndTestHandler.h
+++ b/Source/CTest/cmCTestBuildAndTestHandler.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestGenericHandler.h"
-#include "cmTypeMacro.h"
#include <sstream>
#include <stddef.h>
diff --git a/Source/CTest/cmCTestBuildCommand.h b/Source/CTest/cmCTestBuildCommand.h
index acc0ecf..9cc6f7e 100644
--- a/Source/CTest/cmCTestBuildCommand.h
+++ b/Source/CTest/cmCTestBuildCommand.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestHandlerCommand.h"
-#include "cmTypeMacro.h"
#include <string>
#include <vector>
diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h
index 69970d5..5bd1157 100644
--- a/Source/CTest/cmCTestBuildHandler.h
+++ b/Source/CTest/cmCTestBuildHandler.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestGenericHandler.h"
-#include "cmTypeMacro.h"
#include <cmsys/RegularExpression.hxx>
#include <deque>
diff --git a/Source/CTest/cmCTestConfigureCommand.h b/Source/CTest/cmCTestConfigureCommand.h
index 95a476f..22d1217 100644
--- a/Source/CTest/cmCTestConfigureCommand.h
+++ b/Source/CTest/cmCTestConfigureCommand.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestHandlerCommand.h"
-#include "cmTypeMacro.h"
#include <string>
diff --git a/Source/CTest/cmCTestConfigureHandler.h b/Source/CTest/cmCTestConfigureHandler.h
index 4a7c74b..7fa95ed 100644
--- a/Source/CTest/cmCTestConfigureHandler.h
+++ b/Source/CTest/cmCTestConfigureHandler.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestGenericHandler.h"
-#include "cmTypeMacro.h"
/** \class cmCTestConfigureHandler
* \brief A class that handles ctest -S invocations
diff --git a/Source/CTest/cmCTestCoverageCommand.h b/Source/CTest/cmCTestCoverageCommand.h
index 98dd6bf..bf42aa1 100644
--- a/Source/CTest/cmCTestCoverageCommand.h
+++ b/Source/CTest/cmCTestCoverageCommand.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestHandlerCommand.h"
-#include "cmTypeMacro.h"
#include <set>
#include <string>
diff --git a/Source/CTest/cmCTestCoverageHandler.h b/Source/CTest/cmCTestCoverageHandler.h
index 0ba4a7a..339b5d7 100644
--- a/Source/CTest/cmCTestCoverageHandler.h
+++ b/Source/CTest/cmCTestCoverageHandler.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestGenericHandler.h"
-#include "cmTypeMacro.h"
#include <cmsys/RegularExpression.hxx>
#include <iosfwd>
diff --git a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h
index a8d00e0..4c1438b 100644
--- a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h
+++ b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestCommand.h"
-#include "cmTypeMacro.h"
#include <string>
#include <vector>
diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h
index ef9fdc0..4176eb2 100644
--- a/Source/CTest/cmCTestGenericHandler.h
+++ b/Source/CTest/cmCTestGenericHandler.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTest.h"
-#include "cmObject.h"
#include "cmSystemTools.h"
#include <map>
diff --git a/Source/CTest/cmCTestHandlerCommand.h b/Source/CTest/cmCTestHandlerCommand.h
index 0a1bae4..92748af 100644
--- a/Source/CTest/cmCTestHandlerCommand.h
+++ b/Source/CTest/cmCTestHandlerCommand.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestCommand.h"
-#include "cmTypeMacro.h"
#include <stddef.h>
#include <string>
diff --git a/Source/CTest/cmCTestMemCheckCommand.h b/Source/CTest/cmCTestMemCheckCommand.h
index efd4ecf..30d9e2b 100644
--- a/Source/CTest/cmCTestMemCheckCommand.h
+++ b/Source/CTest/cmCTestMemCheckCommand.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestTestCommand.h"
-#include "cmTypeMacro.h"
#include <string>
diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h
index 2300f68..b12da28 100644
--- a/Source/CTest/cmCTestMemCheckHandler.h
+++ b/Source/CTest/cmCTestMemCheckHandler.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestTestHandler.h"
-#include "cmTypeMacro.h"
#include <string>
#include <vector>
diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.h b/Source/CTest/cmCTestReadCustomFilesCommand.h
index 53610ba..e155595 100644
--- a/Source/CTest/cmCTestReadCustomFilesCommand.h
+++ b/Source/CTest/cmCTestReadCustomFilesCommand.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestCommand.h"
-#include "cmTypeMacro.h"
#include <string>
#include <vector>
diff --git a/Source/CTest/cmCTestRunScriptCommand.h b/Source/CTest/cmCTestRunScriptCommand.h
index ac79db4..01ed62e 100644
--- a/Source/CTest/cmCTestRunScriptCommand.h
+++ b/Source/CTest/cmCTestRunScriptCommand.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestCommand.h"
-#include "cmTypeMacro.h"
#include <string>
#include <vector>
diff --git a/Source/CTest/cmCTestScriptHandler.h b/Source/CTest/cmCTestScriptHandler.h
index 5ba8ecf..47644be 100644
--- a/Source/CTest/cmCTestScriptHandler.h
+++ b/Source/CTest/cmCTestScriptHandler.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestGenericHandler.h"
-#include "cmTypeMacro.h"
#include <string>
#include <vector>
diff --git a/Source/CTest/cmCTestSleepCommand.h b/Source/CTest/cmCTestSleepCommand.h
index c7e076f..1052f76 100644
--- a/Source/CTest/cmCTestSleepCommand.h
+++ b/Source/CTest/cmCTestSleepCommand.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestCommand.h"
-#include "cmTypeMacro.h"
#include <string>
#include <vector>
diff --git a/Source/CTest/cmCTestStartCommand.h b/Source/CTest/cmCTestStartCommand.h
index 1686b20..cc72d0c 100644
--- a/Source/CTest/cmCTestStartCommand.h
+++ b/Source/CTest/cmCTestStartCommand.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestCommand.h"
-#include "cmTypeMacro.h"
#include <iosfwd>
#include <string>
diff --git a/Source/CTest/cmCTestSubmitCommand.h b/Source/CTest/cmCTestSubmitCommand.h
index f8b9a45..f5b52c1 100644
--- a/Source/CTest/cmCTestSubmitCommand.h
+++ b/Source/CTest/cmCTestSubmitCommand.h
@@ -7,7 +7,6 @@
#include "cmCTest.h"
#include "cmCTestHandlerCommand.h"
-#include "cmTypeMacro.h"
#include <set>
#include <string>
diff --git a/Source/CTest/cmCTestSubmitHandler.h b/Source/CTest/cmCTestSubmitHandler.h
index 6e57de8..baaf8af 100644
--- a/Source/CTest/cmCTestSubmitHandler.h
+++ b/Source/CTest/cmCTestSubmitHandler.h
@@ -7,7 +7,6 @@
#include "cmCTest.h"
#include "cmCTestGenericHandler.h"
-#include "cmTypeMacro.h"
#include <iosfwd>
#include <set>
diff --git a/Source/CTest/cmCTestTestCommand.h b/Source/CTest/cmCTestTestCommand.h
index b4a01dc..3250d93 100644
--- a/Source/CTest/cmCTestTestCommand.h
+++ b/Source/CTest/cmCTestTestCommand.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestHandlerCommand.h"
-#include "cmTypeMacro.h"
#include <string>
diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h
index 703707f..5b07e98 100644
--- a/Source/CTest/cmCTestTestHandler.h
+++ b/Source/CTest/cmCTestTestHandler.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestGenericHandler.h"
-#include "cmTypeMacro.h"
#include <cmsys/RegularExpression.hxx>
#include <iosfwd>
diff --git a/Source/CTest/cmCTestUpdateCommand.h b/Source/CTest/cmCTestUpdateCommand.h
index e834a29..5761f50 100644
--- a/Source/CTest/cmCTestUpdateCommand.h
+++ b/Source/CTest/cmCTestUpdateCommand.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestHandlerCommand.h"
-#include "cmTypeMacro.h"
#include <string>
diff --git a/Source/CTest/cmCTestUpdateHandler.h b/Source/CTest/cmCTestUpdateHandler.h
index 9a3ec1b..87781e8 100644
--- a/Source/CTest/cmCTestUpdateHandler.h
+++ b/Source/CTest/cmCTestUpdateHandler.h
@@ -6,7 +6,6 @@
#include <cmConfigure.h>
#include "cmCTestGenericHandler.h"
-#include "cmTypeMacro.h"
#include <string>
#include <utility>
diff --git a/Source/CTest/cmCTestUploadCommand.h b/Source/CTest/cmCTestUploadCommand.h
index b231844..474f699 100644
--- a/Source/CTest/cmCTestUploadCommand.h
+++ b/Source/CTest/cmCTestUploadCommand.h
@@ -7,7 +7,6 @@
#include "cmCTest.h"
#include "cmCTestHandlerCommand.h"
-#include "cmTypeMacro.h"
#include <string>
diff --git a/Source/CTest/cmCTestUploadHandler.h b/Source/CTest/cmCTestUploadHandler.h
index eb05a86..77c2aec 100644
--- a/Source/CTest/cmCTestUploadHandler.h
+++ b/Source/CTest/cmCTestUploadHandler.h
@@ -7,7 +7,6 @@
#include "cmCTest.h"
#include "cmCTestGenericHandler.h"
-#include "cmTypeMacro.h"
/** \class cmCTestUploadHandler
* \brief Helper class for CTest
diff --git a/Source/cmAddCompileOptionsCommand.h b/Source/cmAddCompileOptionsCommand.h
index 3625626..71009b4 100644
--- a/Source/cmAddCompileOptionsCommand.h
+++ b/Source/cmAddCompileOptionsCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmAuxSourceDirectoryCommand.h b/Source/cmAuxSourceDirectoryCommand.h
index 89eba7f..d99bf7b 100644
--- a/Source/cmAuxSourceDirectoryCommand.h
+++ b/Source/cmAuxSourceDirectoryCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmBuildNameCommand.h b/Source/cmBuildNameCommand.h
index aa8669a..1e1f4b5 100644
--- a/Source/cmBuildNameCommand.h
+++ b/Source/cmBuildNameCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmCMakeHostSystemInformationCommand.h b/Source/cmCMakeHostSystemInformationCommand.h
index 8420d08..22f3d54 100644
--- a/Source/cmCMakeHostSystemInformationCommand.h
+++ b/Source/cmCMakeHostSystemInformationCommand.h
@@ -9,7 +9,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
namespace cmsys {
diff --git a/Source/cmCommand.h b/Source/cmCommand.h
index b263a61..dcfe8da 100644
--- a/Source/cmCommand.h
+++ b/Source/cmCommand.h
@@ -3,8 +3,6 @@
#ifndef cmCommand_h
#define cmCommand_h
-#include "cmObject.h"
-
#include "cmCommandArgumentsHelper.h"
#include "cmListFileCache.h"
#include "cmMakefile.h"
diff --git a/Source/cmElseIfCommand.h b/Source/cmElseIfCommand.h
index c66d642..3f1ddde 100644
--- a/Source/cmElseIfCommand.h
+++ b/Source/cmElseIfCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmExportCommand.h b/Source/cmExportCommand.h
index 41c3291..99dac7d 100644
--- a/Source/cmExportCommand.h
+++ b/Source/cmExportCommand.h
@@ -9,7 +9,6 @@
#include "cmCommand.h"
#include "cmCommandArgumentsHelper.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
class cmExportSet;
diff --git a/Source/cmExportLibraryDependenciesCommand.h b/Source/cmExportLibraryDependenciesCommand.h
index 2f6ad65..be53349 100644
--- a/Source/cmExportLibraryDependenciesCommand.h
+++ b/Source/cmExportLibraryDependenciesCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmFLTKWrapUICommand.h b/Source/cmFLTKWrapUICommand.h
index 5559854..835f0a7 100644
--- a/Source/cmFLTKWrapUICommand.h
+++ b/Source/cmFLTKWrapUICommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
class cmSourceFile;
diff --git a/Source/cmIncludeExternalMSProjectCommand.h b/Source/cmIncludeExternalMSProjectCommand.h
index 2f95589..9fcf467 100644
--- a/Source/cmIncludeExternalMSProjectCommand.h
+++ b/Source/cmIncludeExternalMSProjectCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmInstallProgramsCommand.h b/Source/cmInstallProgramsCommand.h
index 235ff1a..ca07a2f 100644
--- a/Source/cmInstallProgramsCommand.h
+++ b/Source/cmInstallProgramsCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmLinkLibrariesCommand.h b/Source/cmLinkLibrariesCommand.h
index 71053f5..66d7ec4 100644
--- a/Source/cmLinkLibrariesCommand.h
+++ b/Source/cmLinkLibrariesCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmLoadCacheCommand.h b/Source/cmLoadCacheCommand.h
index 432ba36..539c74e 100644
--- a/Source/cmLoadCacheCommand.h
+++ b/Source/cmLoadCacheCommand.h
@@ -9,7 +9,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmLoadCommandCommand.h b/Source/cmLoadCommandCommand.h
index 6c893fc..d16dfea 100644
--- a/Source/cmLoadCommandCommand.h
+++ b/Source/cmLoadCommandCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmObject.h b/Source/cmObject.h
deleted file mode 100644
index 621a06f..0000000
--- a/Source/cmObject.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
- file Copyright.txt or https://cmake.org/licensing for details. */
-#ifndef cmObject_h
-#define cmObject_h
-
-#include <cmConfigure.h>
-
-#include "cmStandardIncludes.h"
-
-/** \class cmObject
- * \brief Superclass for all commands and other classes in CMake.
- *
- * cmObject is the base class for all classes in CMake. It defines some
- * methods such as GetNameOfClass, IsA, SafeDownCast.
- */
-class cmObject
-{
-public:
- /**
- * Need virtual destructor to destroy real command type.
- */
- virtual ~cmObject() {}
-
- /**
- * The class name of the command.
- */
- virtual const char* GetNameOfClass() = 0;
-
- /**
- * Returns true if this class is the given class, or a subclass of it.
- */
- static bool IsTypeOf(const char* type) { return !strcmp("cmObject", type); }
-
- /**
- * Returns true if this object is an instance of the given class or
- * a subclass of it.
- */
- virtual bool IsA(const char* type) { return cmObject::IsTypeOf(type); }
-};
-
-#endif
diff --git a/Source/cmOutputRequiredFilesCommand.h b/Source/cmOutputRequiredFilesCommand.h
index cb48568..c4ce680 100644
--- a/Source/cmOutputRequiredFilesCommand.h
+++ b/Source/cmOutputRequiredFilesCommand.h
@@ -10,7 +10,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmDependInformation;
class cmExecutionStatus;
diff --git a/Source/cmQTWrapCPPCommand.h b/Source/cmQTWrapCPPCommand.h
index d07eba0..8eb5ff9 100644
--- a/Source/cmQTWrapCPPCommand.h
+++ b/Source/cmQTWrapCPPCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmQTWrapUICommand.h b/Source/cmQTWrapUICommand.h
index 9b8c5a0..876ddd5 100644
--- a/Source/cmQTWrapUICommand.h
+++ b/Source/cmQTWrapUICommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmRemoveCommand.h b/Source/cmRemoveCommand.h
index 8d82d6f..c935f28 100644
--- a/Source/cmRemoveCommand.h
+++ b/Source/cmRemoveCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmRemoveDefinitionsCommand.h b/Source/cmRemoveDefinitionsCommand.h
index 6aed8fc..2bcc12d 100644
--- a/Source/cmRemoveDefinitionsCommand.h
+++ b/Source/cmRemoveDefinitionsCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmSourceGroupCommand.h b/Source/cmSourceGroupCommand.h
index 86bd61e..f533be1 100644
--- a/Source/cmSourceGroupCommand.h
+++ b/Source/cmSourceGroupCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 0aab6d9..a2047af 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -49,6 +49,5 @@ extern void operator<<(std::ostream&, const std::ostringstream&);
#include "cmCustomCommandLines.h"
#include "cmDocumentationEntry.h"
#include "cmTargetLinkLibraryType.h"
-#include "cmTypeMacro.h"
#endif
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 468b191..db1e542 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -10,7 +10,6 @@
#include "cmDefinitions.h"
#include "cmListFileCache.h"
#include "cmSystemTools.h"
-#include "cmTypeMacro.h"
#include "cmake.h"
#include <algorithm>
diff --git a/Source/cmSubdirDependsCommand.h b/Source/cmSubdirDependsCommand.h
index aa3d2b3..80ff24f 100644
--- a/Source/cmSubdirDependsCommand.h
+++ b/Source/cmSubdirDependsCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmTargetCompileDefinitionsCommand.h b/Source/cmTargetCompileDefinitionsCommand.h
index 766a9c3..caaf23b 100644
--- a/Source/cmTargetCompileDefinitionsCommand.h
+++ b/Source/cmTargetCompileDefinitionsCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmTargetPropCommandBase.h"
-#include "cmTypeMacro.h"
class cmCommand;
class cmExecutionStatus;
diff --git a/Source/cmTargetCompileFeaturesCommand.h b/Source/cmTargetCompileFeaturesCommand.h
index c599a37..01f2938 100644
--- a/Source/cmTargetCompileFeaturesCommand.h
+++ b/Source/cmTargetCompileFeaturesCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmTargetPropCommandBase.h"
-#include "cmTypeMacro.h"
class cmCommand;
class cmExecutionStatus;
diff --git a/Source/cmTargetCompileOptionsCommand.h b/Source/cmTargetCompileOptionsCommand.h
index 7b41352..179013b 100644
--- a/Source/cmTargetCompileOptionsCommand.h
+++ b/Source/cmTargetCompileOptionsCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmTargetPropCommandBase.h"
-#include "cmTypeMacro.h"
class cmCommand;
class cmExecutionStatus;
diff --git a/Source/cmTargetIncludeDirectoriesCommand.h b/Source/cmTargetIncludeDirectoriesCommand.h
index 81c0b11..bc6cf0d 100644
--- a/Source/cmTargetIncludeDirectoriesCommand.h
+++ b/Source/cmTargetIncludeDirectoriesCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmTargetPropCommandBase.h"
-#include "cmTypeMacro.h"
class cmCommand;
class cmExecutionStatus;
diff --git a/Source/cmTargetSourcesCommand.h b/Source/cmTargetSourcesCommand.h
index 6f4b49f..b1afac2 100644
--- a/Source/cmTargetSourcesCommand.h
+++ b/Source/cmTargetSourcesCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmTargetPropCommandBase.h"
-#include "cmTypeMacro.h"
class cmCommand;
class cmExecutionStatus;
diff --git a/Source/cmTypeMacro.h b/Source/cmTypeMacro.h
deleted file mode 100644
index b302ff1..0000000
--- a/Source/cmTypeMacro.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
- file Copyright.txt or https://cmake.org/licensing for details. */
-#ifndef cmTypeMacro_h
-#define cmTypeMacro_h
-
-// All subclasses of cmCommand or cmCTestGenericHandler should
-// invoke this macro.
-#define cmTypeMacro(thisClass, superclass) \
- const char* GetNameOfClass() CM_OVERRIDE { return #thisClass; } \
- typedef superclass Superclass; \
- static bool IsTypeOf(const char* type) \
- { \
- if (!strcmp(#thisClass, type)) { \
- return true; \
- } \
- return Superclass::IsTypeOf(type); \
- } \
- bool IsA(const char* type) CM_OVERRIDE \
- { \
- return thisClass::IsTypeOf(type); \
- } \
- static thisClass* SafeDownCast(cmObject* c) \
- { \
- if (c && c->IsA(#thisClass)) { \
- return static_cast<thisClass*>(c); \
- } \
- return 0; \
- } \
- class cmTypeMacro_UseTrailingSemicolon
-
-#endif
diff --git a/Source/cmUseMangledMesaCommand.h b/Source/cmUseMangledMesaCommand.h
index 68e77a1..9a49f94 100644
--- a/Source/cmUseMangledMesaCommand.h
+++ b/Source/cmUseMangledMesaCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmUtilitySourceCommand.h b/Source/cmUtilitySourceCommand.h
index a8549d1..849b966 100644
--- a/Source/cmUtilitySourceCommand.h
+++ b/Source/cmUtilitySourceCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmVariableRequiresCommand.h b/Source/cmVariableRequiresCommand.h
index 0b6be3b..baf717c 100644
--- a/Source/cmVariableRequiresCommand.h
+++ b/Source/cmVariableRequiresCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmVariableWatchCommand.h b/Source/cmVariableWatchCommand.h
index 2541ca8..919bac4 100644
--- a/Source/cmVariableWatchCommand.h
+++ b/Source/cmVariableWatchCommand.h
@@ -9,7 +9,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
diff --git a/Source/cmWriteFileCommand.h b/Source/cmWriteFileCommand.h
index df7ccc3..73e6e22 100644
--- a/Source/cmWriteFileCommand.h
+++ b/Source/cmWriteFileCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmTypeMacro.h"
class cmExecutionStatus;
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/IFW/cmCPackIFWGenerator.h | 1 -
Source/CPack/cmCPack7zGenerator.h | 1 -
Source/CPack/cmCPackArchiveGenerator.h | 1 -
Source/CPack/cmCPackDebGenerator.h | 1 -
Source/CPack/cmCPackGenerator.h | 2 -
Source/CPack/cmCPackGeneratorFactory.h | 3 --
Source/CPack/cmCPackLog.h | 3 --
Source/CPack/cmCPackNSISGenerator.h | 1 -
Source/CPack/cmCPackPKGGenerator.h | 3 ++
Source/CPack/cmCPackRPMGenerator.h | 1 -
Source/CPack/cmCPackSTGZGenerator.h | 1 -
Source/CPack/cmCPackTGZGenerator.h | 1 -
Source/CPack/cmCPackTXZGenerator.h | 1 -
Source/CPack/cmCPackTarBZip2Generator.h | 1 -
Source/CPack/cmCPackTarCompressGenerator.h | 1 -
Source/CPack/cmCPackZIPGenerator.h | 1 -
Source/CPack/cpack.cxx | 1 -
Source/CTest/cmCTestBuildAndTestHandler.h | 1 -
Source/CTest/cmCTestBuildCommand.h | 1 -
Source/CTest/cmCTestBuildHandler.h | 1 -
Source/CTest/cmCTestConfigureCommand.h | 1 -
Source/CTest/cmCTestConfigureHandler.h | 1 -
Source/CTest/cmCTestCoverageCommand.h | 1 -
Source/CTest/cmCTestCoverageHandler.h | 1 -
Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h | 1 -
Source/CTest/cmCTestGenericHandler.h | 1 -
Source/CTest/cmCTestHandlerCommand.h | 1 -
Source/CTest/cmCTestMemCheckCommand.h | 1 -
Source/CTest/cmCTestMemCheckHandler.h | 1 -
Source/CTest/cmCTestReadCustomFilesCommand.h | 1 -
Source/CTest/cmCTestRunScriptCommand.h | 1 -
Source/CTest/cmCTestScriptHandler.h | 1 -
Source/CTest/cmCTestSleepCommand.h | 1 -
Source/CTest/cmCTestStartCommand.h | 1 -
Source/CTest/cmCTestSubmitCommand.h | 1 -
Source/CTest/cmCTestSubmitHandler.h | 1 -
Source/CTest/cmCTestTestCommand.h | 1 -
Source/CTest/cmCTestTestHandler.h | 1 -
Source/CTest/cmCTestUpdateCommand.h | 1 -
Source/CTest/cmCTestUpdateHandler.h | 1 -
Source/CTest/cmCTestUploadCommand.h | 1 -
Source/CTest/cmCTestUploadHandler.h | 1 -
Source/cmAddCompileOptionsCommand.h | 1 -
Source/cmAuxSourceDirectoryCommand.h | 1 -
Source/cmBuildNameCommand.h | 1 -
Source/cmCMakeHostSystemInformationCommand.h | 1 -
Source/cmCommand.h | 2 -
Source/cmElseIfCommand.h | 1 -
Source/cmExportCommand.h | 1 -
Source/cmExportLibraryDependenciesCommand.h | 1 -
Source/cmFLTKWrapUICommand.h | 1 -
Source/cmIncludeExternalMSProjectCommand.h | 1 -
Source/cmInstallProgramsCommand.h | 1 -
Source/cmLinkLibrariesCommand.h | 1 -
Source/cmLoadCacheCommand.h | 1 -
Source/cmLoadCommandCommand.h | 1 -
Source/cmObject.h | 41 ---------------------
Source/cmOutputRequiredFilesCommand.h | 1 -
Source/cmQTWrapCPPCommand.h | 1 -
Source/cmQTWrapUICommand.h | 1 -
Source/cmRemoveCommand.h | 1 -
Source/cmRemoveDefinitionsCommand.h | 1 -
Source/cmSourceGroupCommand.h | 1 -
Source/cmStandardIncludes.h | 1 -
Source/cmState.cxx | 1 -
Source/cmSubdirDependsCommand.h | 1 -
Source/cmTargetCompileDefinitionsCommand.h | 1 -
Source/cmTargetCompileFeaturesCommand.h | 1 -
Source/cmTargetCompileOptionsCommand.h | 1 -
Source/cmTargetIncludeDirectoriesCommand.h | 1 -
Source/cmTargetSourcesCommand.h | 1 -
Source/cmTypeMacro.h | 31 ----------------
Source/cmUseMangledMesaCommand.h | 1 -
Source/cmUtilitySourceCommand.h | 1 -
Source/cmVariableRequiresCommand.h | 1 -
Source/cmVariableWatchCommand.h | 1 -
Source/cmWriteFileCommand.h | 1 -
77 files changed, 3 insertions(+), 152 deletions(-)
delete mode 100644 Source/cmObject.h
delete mode 100644 Source/cmTypeMacro.h
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list