[Cmake-commits] CMake branch, next, updated. v3.1.2-1065-gdd90ab2
Stephen Kelly
steveire at gmail.com
Thu Feb 5 16:20:17 EST 2015
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 dd90ab2b3d50268705c5a6ca3e0aa9c9d16a3038 (commit)
via 3a9bb53a0034c37ac38581fc3db63c3431682d2a (commit)
via 47504ae2100cd13eb89b612ed819cc3d9548b12a (commit)
via 7b593d4fc851a60ac4a8cc75d29aae1e9b711f86 (commit)
via 4e9a4428f859fef71b774b095716d470b5ac7334 (commit)
via 3e9d6e5439e7f35dbc5961c8d1bb5b2d35bfc451 (commit)
from 4587caf8dc727e8a18b28cef9755c0b1d4500f4f (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd90ab2b3d50268705c5a6ca3e0aa9c9d16a3038
commit dd90ab2b3d50268705c5a6ca3e0aa9c9d16a3038
Merge: 4587caf 3a9bb53
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 5 16:20:15 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 16:20:15 2015 -0500
Merge topic 'cmStandardIncludes-cleanup' into next
3a9bb53a cmStandardIncludes: Remove functional header.
47504ae2 cmStandardIncludes: Remove list include.
7b593d4f cmStandardIncludes: Remove deque include.
4e9a4428 cmStandardIncludes: Remove some VS6 workarounds.
3e9d6e54 cmStandardIncludes: Remove compatibility typedef added for MSVC6.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a9bb53a0034c37ac38581fc3db63c3431682d2a
commit 3a9bb53a0034c37ac38581fc3db63c3431682d2a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 5 22:08:53 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 22:19:30 2015 +0100
cmStandardIncludes: Remove functional header.
It is unused.
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 8b4742a..262e9a6 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -51,7 +51,6 @@
#include <string>
#include <iterator>
#include <algorithm>
-#include <functional>
#include <map>
#include <set>
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47504ae2100cd13eb89b612ed819cc3d9548b12a
commit 47504ae2100cd13eb89b612ed819cc3d9548b12a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 12 21:17:55 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 22:19:30 2015 +0100
cmStandardIncludes: Remove list include.
Include it only where used.
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 1c670d2..006239a 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -25,6 +25,7 @@
#include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx>
#include <algorithm>
+#include <list>
#if defined(__HAIKU__)
#include <FindDirectory.h>
diff --git a/Source/CTest/cmCTestGlobalVC.h b/Source/CTest/cmCTestGlobalVC.h
index cb0d165..29e0a61 100644
--- a/Source/CTest/cmCTestGlobalVC.h
+++ b/Source/CTest/cmCTestGlobalVC.h
@@ -14,6 +14,8 @@
#include "cmCTestVC.h"
+#include <list>
+
/** \class cmCTestGlobalVC
* \brief Base class for handling globally-versioned trees
*
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index f9e8a3c..f223127 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -16,6 +16,7 @@
#include "cmSystemTools.h"
#include <stdlib.h>
#include <stack>
+#include <list>
#include <float.h>
#include <cmsys/FStream.hxx>
diff --git a/Source/CTest/cmCTestSVN.h b/Source/CTest/cmCTestSVN.h
index c6548e3..17bf7cb 100644
--- a/Source/CTest/cmCTestSVN.h
+++ b/Source/CTest/cmCTestSVN.h
@@ -14,6 +14,8 @@
#include "cmCTestGlobalVC.h"
+#include <list>
+
/** \class cmCTestSVN
* \brief Interaction with subversion command-line tool
*
diff --git a/Source/cmCommands.h b/Source/cmCommands.h
index c56673f..e902853 100644
--- a/Source/cmCommands.h
+++ b/Source/cmCommands.h
@@ -13,6 +13,8 @@
#define cmCommands_h
#include "cmStandardIncludes.h"
+#include <list>
+
class cmCommand;
/**
* Global function to return all compiled in commands.
diff --git a/Source/cmConditionEvaluator.h b/Source/cmConditionEvaluator.h
index 01624f9..fcef234 100644
--- a/Source/cmConditionEvaluator.h
+++ b/Source/cmConditionEvaluator.h
@@ -15,6 +15,8 @@
#include "cmCommand.h"
#include "cmExpandedCommandArgument.h"
+#include <list>
+
class cmConditionEvaluator
{
public:
diff --git a/Source/cmFileLockPool.h b/Source/cmFileLockPool.h
index baef310..f0614a3 100644
--- a/Source/cmFileLockPool.h
+++ b/Source/cmFileLockPool.h
@@ -14,6 +14,8 @@
#include "cmStandardIncludes.h"
+#include <list>
+
class cmFileLockResult;
class cmFileLock;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ba914e1..ff3e35d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -38,6 +38,7 @@
#include <cmsys/auto_ptr.hxx>
#include <stack>
+#include <list>
#include <ctype.h> // for isspace
#include <assert.h>
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 79fa5df..f74e3c5 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -14,6 +14,8 @@
#ifndef cmQtAutoGenerators_h
#define cmQtAutoGenerators_h
+#include <list>
+
class cmGlobalGenerator;
class cmMakefile;
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index cf23feb..8b4742a 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -53,7 +53,6 @@
#include <algorithm>
#include <functional>
#include <map>
-#include <list>
#include <set>
// include the "c" string header
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 652e451..4b6af0a 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -103,6 +103,8 @@
#include <sys/stat.h> // struct stat
+#include <list>
+
static bool cmakeCheckStampFile(const char* stampName);
static bool cmakeCheckStampList(const char* stampName);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b593d4fc851a60ac4a8cc75d29aae1e9b711f86
commit 7b593d4fc851a60ac4a8cc75d29aae1e9b711f86
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 12 21:11:16 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 22:19:29 2015 +0100
cmStandardIncludes: Remove deque include.
Include it only where used.
diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h
index 09346f9..d13d5cf 100644
--- a/Source/CTest/cmCTestBuildHandler.h
+++ b/Source/CTest/cmCTestBuildHandler.h
@@ -19,6 +19,8 @@
#include <cmsys/RegularExpression.hxx>
+#include <deque>
+
class cmMakefile;
/** \class cmCTestBuildHandler
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index bff8c12..110db24 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -35,6 +35,7 @@
#endif
#include <stack>
+#include <deque>
class cmFunctionBlocker;
class cmCommand;
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 7a966d8..cf23feb 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -55,7 +55,6 @@
#include <map>
#include <list>
#include <set>
-#include <deque>
// include the "c" string header
#include <string.h>
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e9a4428f859fef71b774b095716d470b5ac7334
commit 4e9a4428f859fef71b774b095716d470b5ac7334
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 12 21:05:34 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 22:19:29 2015 +0100
cmStandardIncludes: Remove some VS6 workarounds.
Added in commit v2.6.0~2824 (COMP: Fix warnings in system headers
on VS6., 2006-08-29), but no longer needed.
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 3b46e8d..7a966d8 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -22,7 +22,6 @@
#ifdef _MSC_VER
#pragma warning ( disable : 4786 )
#pragma warning ( disable : 4503 )
-#pragma warning ( disable : 4512 ) /* operator=() could not be generated */
#endif
@@ -42,11 +41,6 @@
# include <cmsys/IOStream.hxx>
#endif
-// Avoid warnings in system headers.
-#if defined(_MSC_VER)
-# pragma warning (push,1)
-#endif
-
#include <fstream>
#include <iostream>
#include <iomanip>
@@ -63,10 +57,6 @@
#include <set>
#include <deque>
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif
-
// include the "c" string header
#include <string.h>
#include <stdio.h>
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e9d6e5439e7f35dbc5961c8d1bb5b2d35bfc451
commit 3e9d6e5439e7f35dbc5961c8d1bb5b2d35bfc451
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 12 20:51:42 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 22:19:20 2015 +0100
cmStandardIncludes: Remove compatibility typedef added for MSVC6.
Added in commit v2.4.0~3401 (ERR: Fix build problems on Visual
Studio 6, 2004-01-26)
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 646300d..3b46e8d 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -72,10 +72,6 @@
#include <stdio.h>
#include <stdlib.h>
-#if defined( _MSC_VER )
-typedef unsigned short mode_t;
-#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!
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/cmCPackGenerator.cxx | 1 +
Source/CTest/cmCTestBuildHandler.h | 2 ++
Source/CTest/cmCTestGlobalVC.h | 2 ++
Source/CTest/cmCTestMultiProcessHandler.cxx | 1 +
Source/CTest/cmCTestSVN.h | 2 ++
Source/cmCommands.h | 2 ++
Source/cmConditionEvaluator.h | 2 ++
Source/cmFileLockPool.h | 2 ++
Source/cmMakefile.cxx | 1 +
Source/cmMakefile.h | 1 +
Source/cmQtAutoGenerators.h | 2 ++
Source/cmStandardIncludes.h | 17 -----------------
Source/cmake.cxx | 2 ++
13 files changed, 20 insertions(+), 17 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list