[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-298-gc563a2b
Daniel Pfeifer
daniel at pfeifer-mail.de
Mon Jun 13 16:48:56 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 c563a2b5e188497f89af55d0bc758172c0505350 (commit)
via 6c1abff0e1ef111768af8bf5aae5241c506e8648 (commit)
via 54b5c65ae5030ef0f78b6e8b78ed5566c2e9740e (commit)
via 0f2e7908d5e10d59e801cb78ea4ef15daf7e5740 (commit)
via 535ec2bf1a57375221259ed1041c6d8d35c79b91 (commit)
via c3819acad22c1bc0f763f7222648e8cade777ca6 (commit)
from 86b38f887c22e3f7b609afe9e1c0fb2866d3bf7b (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=c563a2b5e188497f89af55d0bc758172c0505350
commit c563a2b5e188497f89af55d0bc758172c0505350
Merge: 86b38f8 6c1abff
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Mon Jun 13 16:48:55 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 13 16:48:55 2016 -0400
Merge topic 'iwyu-preparation' into next
6c1abff0 cmTargetLinkLibraryType: Extract from cmStandardIncludes.h
54b5c65a cmTypeMacro: Extract from cmStandardIncludes.h
0f2e7908 cmCustomCommandLines: Extract from cmStandardIncludes.h
535ec2bf cmDocumentationEntry: Extract from cmStandardIncludes
c3819aca cmConfigure.h: Establish as 'include first' file
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c1abff0e1ef111768af8bf5aae5241c506e8648
commit 6c1abff0e1ef111768af8bf5aae5241c506e8648
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun Jun 12 22:49:18 2016 +0200
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Mon Jun 13 22:45:32 2016 +0200
cmTargetLinkLibraryType: Extract from cmStandardIncludes.h
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 135db5e..acbf98b 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -58,12 +58,6 @@ extern void operator<<(std::ostream&, const std::ostringstream&);
#include "cmDocumentationEntry.h"
#include "cmCustomCommandLines.h"
#include "cmTypeMacro.h"
-
-enum cmTargetLinkLibraryType
-{
- GENERAL_LibraryType,
- DEBUG_LibraryType,
- OPTIMIZED_LibraryType
-};
+#include "cmTargetLinkLibraryType.h"
#endif
diff --git a/Source/cmTargetLinkLibraryType.h b/Source/cmTargetLinkLibraryType.h
new file mode 100644
index 0000000..71ac9e7
--- /dev/null
+++ b/Source/cmTargetLinkLibraryType.h
@@ -0,0 +1,22 @@
+/*============================================================================
+ CMake - Cross Platform Makefile Generator
+ Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+
+ Distributed under the OSI-approved BSD License (the "License");
+ see accompanying file Copyright.txt for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the License for more information.
+============================================================================*/
+#ifndef cmTargetLinkLibraryType_h
+#define cmTargetLinkLibraryType_h
+
+enum cmTargetLinkLibraryType
+{
+ GENERAL_LibraryType,
+ DEBUG_LibraryType,
+ OPTIMIZED_LibraryType
+};
+
+#endif
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54b5c65ae5030ef0f78b6e8b78ed5566c2e9740e
commit 54b5c65ae5030ef0f78b6e8b78ed5566c2e9740e
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun Jun 12 22:46:03 2016 +0200
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Mon Jun 13 22:45:32 2016 +0200
cmTypeMacro: Extract from cmStandardIncludes.h
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 016bee1..135db5e 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -57,28 +57,7 @@ extern void operator<<(std::ostream&, const std::ostringstream&);
#include "cmDocumentationEntry.h"
#include "cmCustomCommandLines.h"
-
-// All subclasses of cmCommand or cmCTestGenericHandler should
-// invoke this macro.
-#define cmTypeMacro(thisClass, superclass) \
- virtual const char* GetNameOfClass() { return #thisClass; } \
- typedef superclass Superclass; \
- static bool IsTypeOf(const char* type) \
- { \
- if (!strcmp(#thisClass, type)) { \
- return true; \
- } \
- return Superclass::IsTypeOf(type); \
- } \
- virtual bool IsA(const char* type) { return thisClass::IsTypeOf(type); } \
- static thisClass* SafeDownCast(cmObject* c) \
- { \
- if (c && c->IsA(#thisClass)) { \
- return static_cast<thisClass*>(c); \
- } \
- return 0; \
- } \
- class cmTypeMacro_UseTrailingSemicolon
+#include "cmTypeMacro.h"
enum cmTargetLinkLibraryType
{
diff --git a/Source/cmStandardIncludes.h b/Source/cmTypeMacro.h
similarity index 63%
copy from Source/cmStandardIncludes.h
copy to Source/cmTypeMacro.h
index 016bee1..5c534c3 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmTypeMacro.h
@@ -9,54 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-/**
- * Include header files as a function of the build process, compiler,
- * and operating system.
- */
-#ifndef cmStandardIncludes_h
-#define cmStandardIncludes_h
-
-#include <cmConfigure.h>
-
-// Provide fixed-size integer types.
-#include <cm_kwiml.h>
-
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-
-// we must have stl with the standard include style
-#include <algorithm>
-#include <functional>
-#include <iterator>
-#include <map>
-#include <set>
-#include <string>
-#include <vector>
-
-// include the "c" string header
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(_MSC_VER)
-typedef unsigned short mode_t;
-#else
-#include <sys/types.h>
-#endif
-
-// use this class to shrink the size of symbols in .o files
-// std::string is really basic_string<....lots of stuff....>
-// when combined with a map or set, the symbols can be > 2000 chars!
-#include <cmsys/String.hxx>
-// typedef cmsys::String std::string;
-
-/* Poison this operator to avoid common mistakes. */
-extern void operator<<(std::ostream&, const std::ostringstream&);
-
-#include "cmDocumentationEntry.h"
-#include "cmCustomCommandLines.h"
+#ifndef cmTypeMacro_h
+#define cmTypeMacro_h
// All subclasses of cmCommand or cmCTestGenericHandler should
// invoke this macro.
@@ -80,11 +34,4 @@ extern void operator<<(std::ostream&, const std::ostringstream&);
} \
class cmTypeMacro_UseTrailingSemicolon
-enum cmTargetLinkLibraryType
-{
- GENERAL_LibraryType,
- DEBUG_LibraryType,
- OPTIMIZED_LibraryType
-};
-
#endif
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f2e7908d5e10d59e801cb78ea4ef15daf7e5740
commit 0f2e7908d5e10d59e801cb78ea4ef15daf7e5740
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun Jun 12 22:43:23 2016 +0200
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Mon Jun 13 22:45:31 2016 +0200
cmCustomCommandLines: Extract from cmStandardIncludes.h
diff --git a/Source/cmCustomCommandLines.h b/Source/cmCustomCommandLines.h
new file mode 100644
index 0000000..c67550e
--- /dev/null
+++ b/Source/cmCustomCommandLines.h
@@ -0,0 +1,38 @@
+/*============================================================================
+ CMake - Cross Platform Makefile Generator
+ Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+
+ Distributed under the OSI-approved BSD License (the "License");
+ see accompanying file Copyright.txt for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the License for more information.
+============================================================================*/
+#ifndef cmCustomCommandLines_h
+#define cmCustomCommandLines_h
+
+#include <cmConfigure.h> // IWYU pragma: keep
+
+#include <string>
+#include <vector>
+
+/** Data structure to represent a single command line. */
+class cmCustomCommandLine : public std::vector<std::string>
+{
+public:
+ typedef std::vector<std::string> Superclass;
+ typedef Superclass::iterator iterator;
+ typedef Superclass::const_iterator const_iterator;
+};
+
+/** Data structure to represent a list of command lines. */
+class cmCustomCommandLines : public std::vector<cmCustomCommandLine>
+{
+public:
+ typedef std::vector<cmCustomCommandLine> Superclass;
+ typedef Superclass::iterator iterator;
+ typedef Superclass::const_iterator const_iterator;
+};
+
+#endif
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 82652f1..016bee1 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -56,24 +56,7 @@ typedef unsigned short mode_t;
extern void operator<<(std::ostream&, const std::ostringstream&);
#include "cmDocumentationEntry.h"
-
-/** Data structure to represent a single command line. */
-class cmCustomCommandLine : public std::vector<std::string>
-{
-public:
- typedef std::vector<std::string> Superclass;
- typedef Superclass::iterator iterator;
- typedef Superclass::const_iterator const_iterator;
-};
-
-/** Data structure to represent a list of command lines. */
-class cmCustomCommandLines : public std::vector<cmCustomCommandLine>
-{
-public:
- typedef std::vector<cmCustomCommandLine> Superclass;
- typedef Superclass::iterator iterator;
- typedef Superclass::const_iterator const_iterator;
-};
+#include "cmCustomCommandLines.h"
// All subclasses of cmCommand or cmCTestGenericHandler should
// invoke this macro.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=535ec2bf1a57375221259ed1041c6d8d35c79b91
commit 535ec2bf1a57375221259ed1041c6d8d35c79b91
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun Jun 12 22:38:18 2016 +0200
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Mon Jun 13 22:41:29 2016 +0200
cmDocumentationEntry: Extract from cmStandardIncludes
diff --git a/Source/cmDocumentationEntry.h b/Source/cmDocumentationEntry.h
new file mode 100644
index 0000000..f50839e
--- /dev/null
+++ b/Source/cmDocumentationEntry.h
@@ -0,0 +1,45 @@
+/*============================================================================
+ CMake - Cross Platform Makefile Generator
+ Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+
+ Distributed under the OSI-approved BSD License (the "License");
+ see accompanying file Copyright.txt for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the License for more information.
+============================================================================*/
+#ifndef cmDocumentationEntry_h
+#define cmDocumentationEntry_h
+
+#include <cmConfigure.h> // IWYU pragma: keep
+
+#include <string>
+
+/** Standard documentation entry for cmDocumentation's formatting. */
+struct cmDocumentationEntry
+{
+ std::string Name;
+ std::string Brief;
+ cmDocumentationEntry() {}
+ cmDocumentationEntry(const char* doc[2])
+ {
+ if (doc[0]) {
+ this->Name = doc[0];
+ }
+ if (doc[1]) {
+ this->Brief = doc[1];
+ }
+ }
+ cmDocumentationEntry(const char* n, const char* b)
+ {
+ if (n) {
+ this->Name = n;
+ }
+ if (b) {
+ this->Brief = b;
+ }
+ }
+};
+
+#endif
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 5ff221d..82652f1 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -55,31 +55,7 @@ typedef unsigned short mode_t;
/* Poison this operator to avoid common mistakes. */
extern void operator<<(std::ostream&, const std::ostringstream&);
-/** Standard documentation entry for cmDocumentation's formatting. */
-struct cmDocumentationEntry
-{
- std::string Name;
- std::string Brief;
- cmDocumentationEntry() {}
- cmDocumentationEntry(const char* doc[2])
- {
- if (doc[0]) {
- this->Name = doc[0];
- }
- if (doc[1]) {
- this->Brief = doc[1];
- }
- }
- cmDocumentationEntry(const char* n, const char* b)
- {
- if (n) {
- this->Name = n;
- }
- if (b) {
- this->Brief = b;
- }
- }
-};
+#include "cmDocumentationEntry.h"
/** Data structure to represent a single command line. */
class cmCustomCommandLine : public std::vector<std::string>
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3819acad22c1bc0f763f7222648e8cade777ca6
commit c3819acad22c1bc0f763f7222648e8cade777ca6
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun Jun 12 22:15:08 2016 +0200
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Mon Jun 13 22:37:28 2016 +0200
cmConfigure.h: Establish as 'include first' file
At the moment, cmStandardIncludes.h needs to be included before any
standard includes because it disables some warnings that are caused
by the standard library of some compilers. Move this responsibility
to the cmConfigure.h file.
Also add include guards to cmConfigure.h to make sure the file can be
included multiple times.
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in
index 11ff00b..938b10e 100644
--- a/Source/cmConfigure.cmake.h.in
+++ b/Source/cmConfigure.cmake.h.in
@@ -9,6 +9,21 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
+#ifndef cmConfigure_h
+#define cmConfigure_h
+
+#include <cmsys/Configure.hxx>
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4786)
+#pragma warning(disable : 4503)
+#endif
+
+#ifdef __ICL
+#pragma warning(disable : 985)
+#pragma warning(disable : 1572) /* floating-point equality test */
+#endif
+
#cmakedefine HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE
#cmakedefine HAVE_UNSETENV
#cmakedefine CMAKE_USE_ELF_PARSER
@@ -17,3 +32,5 @@
#cmakedefine CMake_HAVE_CXX11_UNORDERED_MAP
#define CMAKE_BIN_DIR "/@CMAKE_BIN_DIR@"
#define CMAKE_DATA_DIR "/@CMAKE_DATA_DIR@"
+
+#endif
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index d3bf301..5ff221d 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -18,18 +18,6 @@
#include <cmConfigure.h>
-#include <cmsys/Configure.hxx>
-
-#ifdef _MSC_VER
-#pragma warning(disable : 4786)
-#pragma warning(disable : 4503)
-#endif
-
-#ifdef __ICL
-#pragma warning(disable : 985)
-#pragma warning(disable : 1572) /* floating-point equality test */
-#endif
-
// Provide fixed-size integer types.
#include <cm_kwiml.h>
-----------------------------------------------------------------------
Summary of changes:
Source/cmConfigure.cmake.h.in | 17 ++++
Source/cmCustomCommandLines.h | 38 +++++++++
.../cmCTestCommand.h => cmDocumentationEntry.h} | 47 ++++++-----
Source/cmStandardIncludes.h | 88 +-------------------
...ndFileCommand.cxx => cmTargetLinkLibraryType.h} | 15 ++--
Source/cmTypeMacro.h | 37 ++++++++
6 files changed, 130 insertions(+), 112 deletions(-)
create mode 100644 Source/cmCustomCommandLines.h
copy Source/{CTest/cmCTestCommand.h => cmDocumentationEntry.h} (50%)
copy Source/{cmFindFileCommand.cxx => cmTargetLinkLibraryType.h} (76%)
create mode 100644 Source/cmTypeMacro.h
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list