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 0c32230ce5fd27d4a2515c7194df00b3c36b532d (commit)
via 0721d07ec934eb7a6049c2fd9d3b7f5e25707772 (commit)
from 998cbca769bb7cedf28bd1d77c51b0de63f1913c (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=0c32230ce5fd27d4a2515c7194df00b3c36b532d
commit 0c32230ce5fd27d4a2515c7194df00b3c36b532d
Merge: 998cbca 0721d07
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Sun Nov 6 02:45:27 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Nov 6 02:45:27 2016 -0500
Merge topic 'include-what-you-use' into next
0721d07e Fixup! Fix several include-what-you-use findings
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0721d07ec934eb7a6049c2fd9d3b7f5e25707772
commit 0721d07ec934eb7a6049c2fd9d3b7f5e25707772
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Sun Nov 6 08:45:03 2016 +0100
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Sun Nov 6 08:45:03 2016 +0100
Fixup! Fix several include-what-you-use findings
diff --git a/Source/cmGeneratorExpressionEvaluationFile.h
b/Source/cmGeneratorExpressionEvaluationFile.h
index d597270..26135df 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.h
+++ b/Source/cmGeneratorExpressionEvaluationFile.h
@@ -5,14 +5,19 @@
#include <cmConfigure.h> // IWYU pragma: keep
-#include "cmGeneratorExpression.h"
-
-#include <cm_auto_ptr.hxx>
#include <map>
#include <string>
-#include <sys/types.h>
#include <vector>
+#include "cmGeneratorExpression.h"
+#include "cm_auto_ptr.hxx"
+
+#if defined(_MSC_VER)
+typedef unsigned short mode_t;
+#else
+#include <sys/types.h>
+#endif
+
class cmLocalGenerator;
class cmGeneratorExpressionEvaluationFile
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index 9817a3c..0801f26 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -11,6 +11,12 @@
#include <string>
#include <vector>
+#if defined(_MSC_VER)
+typedef unsigned short mode_t;
+#else
+#include <sys/types.h>
+#endif
+
class cmSystemToolsFileTime;
/** \class cmSystemTools
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorExpressionEvaluationFile.h | 13 +++++++++----
Source/cmSystemTools.h | 6 ++++++
2 files changed, 15 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
