[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-328-g6c212eb
Brad King
brad.king at kitware.com
Thu Jun 16 09:28:58 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 6c212eb38d32ddbd7a79a767726ef0f89b71217e (commit)
via 1c2c629769e1bca0cee9e25293c88bfa060e692b (commit)
via ffdc0a8e2877605f0c7f786ec0a2536db4a71f34 (commit)
via e4eb88e21dab2f887b2a974ed89358f398418499 (commit)
from 99beaa936fa48e567cc72311ff2401eb9799820f (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=6c212eb38d32ddbd7a79a767726ef0f89b71217e
commit 6c212eb38d32ddbd7a79a767726ef0f89b71217e
Merge: 99beaa9 1c2c629
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 16 09:28:57 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 16 09:28:57 2016 -0400
Merge topic 'iwyu-preparation' into next
1c2c6297 cmTargetLinkLibraryType: Extract from cmStandardIncludes.h
ffdc0a8e cmTypeMacro: Extract from cmStandardIncludes.h
e4eb88e2 cmCustomCommandLines: Extract from cmStandardIncludes.h
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c2c629769e1bca0cee9e25293c88bfa060e692b
commit 1c2c629769e1bca0cee9e25293c88bfa060e692b
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun Jun 12 22:49:18 2016 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 16 09:26:50 2016 -0400
cmTargetLinkLibraryType: Extract from cmStandardIncludes.h
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 047eded..606978e 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -57,13 +57,7 @@ extern void operator<<(std::ostream&, const std::ostringstream&);
#include "cmCustomCommandLines.h"
#include "cmDocumentationEntry.h"
+#include "cmTargetLinkLibraryType.h"
#include "cmTypeMacro.h"
-enum cmTargetLinkLibraryType
-{
- GENERAL_LibraryType,
- DEBUG_LibraryType,
- OPTIMIZED_LibraryType
-};
-
#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=ffdc0a8e2877605f0c7f786ec0a2536db4a71f34
commit ffdc0a8e2877605f0c7f786ec0a2536db4a71f34
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun Jun 12 22:46:03 2016 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 16 09:26:33 2016 -0400
cmTypeMacro: Extract from cmStandardIncludes.h
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 6a34fb6..047eded 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -57,28 +57,7 @@ extern void operator<<(std::ostream&, const std::ostringstream&);
#include "cmCustomCommandLines.h"
#include "cmDocumentationEntry.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 6a34fb6..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 "cmCustomCommandLines.h"
-#include "cmDocumentationEntry.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=e4eb88e21dab2f887b2a974ed89358f398418499
commit e4eb88e21dab2f887b2a974ed89358f398418499
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun Jun 12 22:43:23 2016 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 16 09:25:22 2016 -0400
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..6a34fb6 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -55,26 +55,9 @@ typedef unsigned short mode_t;
/* Poison this operator to avoid common mistakes. */
extern void operator<<(std::ostream&, const std::ostringstream&);
+#include "cmCustomCommandLines.h"
#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;
-};
-
// All subclasses of cmCommand or cmCTestGenericHandler should
// invoke this macro.
#define cmTypeMacro(thisClass, superclass) \
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list