[Cmake-commits] CMake branch, next, updated. v3.6.1-1702-g68be8cd

[Daniel Pfeifer]

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  68be8cd53896acb0652261fef080155dc1a5248c (commit)
       via  af8e08dd4a1ce3a78ed604a9ffc1adca056ab125 (commit)
      from  e623fc98ca6bfeb4f4fda75b21542aefbcefd78b (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=68be8cd53896acb0652261fef080155dc1a5248c
commit 68be8cd53896acb0652261fef080155dc1a5248c
Merge: e623fc9 af8e08d
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Thu Sep 1 16:48:06 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 1 16:48:06 2016 -0400

    Merge topic 'include-what-you-use' into next
    
    af8e08dd fixup! fix a load of include-what-you-use violations


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af8e08dd4a1ce3a78ed604a9ffc1adca056ab125
commit af8e08dd4a1ce3a78ed604a9ffc1adca056ab125
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Thu Sep 1 22:47:53 2016 +0200
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Thu Sep 1 22:47:53 2016 +0200

    fixup! fix a load of include-what-you-use violations

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 9b3c899..25f9e3a 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -39,12 +39,6 @@
 #include <cm_jsoncpp_writer.h>
 #endif
 
-#include <cmsys/FStream.hxx>
-#include <cmsys/Glob.hxx>
-#include <cmsys/RegularExpression.hxx>
-#include <stdio.h>
-#include <string.h>
-
 // only build kdevelop generator on non-windows platforms
 // when not bootstrapping cmake
 #if !defined(_WIN32)
@@ -97,8 +91,6 @@
 #include "cmExtraKateGenerator.h"
 #include "cmExtraSublimeTextGenerator.h"
 
-class cmCommand;
-
 #ifdef CMAKE_USE_KDEVELOP
 #include "cmGlobalKdevelopGenerator.h"
 #endif
@@ -107,8 +99,6 @@ class cmCommand;
 #include "cmExtraEclipseCDT4Generator.h"
 #endif
 
-#include <stdlib.h> // required for atoi
-
 #if defined(__APPLE__)
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 #include "cmGlobalXCodeGenerator.h"
@@ -119,14 +109,23 @@ class cmCommand;
 #include <sys/time.h>
 #endif
 
+#include <sys/types.h>
 // include sys/stat.h after sys/types.h
+#include <sys/stat.h> // struct stat
+
 #include <algorithm>
+#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <cmsys/RegularExpression.hxx>
 #include <iostream>
 #include <sstream>
-#include <sys/stat.h> // struct stat
-#include <unordered_map>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <utility>
 
+class cmCommand;
+
 namespace {
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)

-----------------------------------------------------------------------

Summary of changes:
 Source/cmake.cxx |   23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake