[Cmake-commits] CMake branch, next, updated. v3.0.1-4794-g1441745

[Brad King]

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  14417456592263921366f058201a12516f2767fe (commit)
       via  2d1dd9af4f18a0ac2e0c36dad0dd2a2a82dae60a (commit)
      from  d54e69bbb941449f0e2f44fe7254b0434d472b91 (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=14417456592263921366f058201a12516f2767fe
commit 14417456592263921366f058201a12516f2767fe
Merge: d54e69b 2d1dd9a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 7 09:31:38 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 7 09:31:38 2014 -0400

    Merge topic 'cpack-ifw-generator' into next
    
    2d1dd9af CPackIFW: Include standard headers through cmStandardIncludes.h


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d1dd9af4f18a0ac2e0c36dad0dd2a2a82dae60a
commit 2d1dd9af4f18a0ac2e0c36dad0dd2a2a82dae60a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 7 09:30:26 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 7 09:30:26 2014 -0400

    CPackIFW: Include standard headers through cmStandardIncludes.h
    
    Otherwise standard interfaces affected by large file support macros may
    not be defined consistently with other translation units.

diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.h b/Source/CPack/IFW/cmCPackIFWGenerator.h
index 1a16784..9c571e8 100644
--- a/Source/CPack/IFW/cmCPackIFWGenerator.h
+++ b/Source/CPack/IFW/cmCPackIFWGenerator.h
@@ -18,8 +18,6 @@
 #include "cmCPackIFWPackage.h"
 #include "cmCPackIFWInstaller.h"
 
-#include <set>
-
 /** \class cmCPackIFWGenerator
  * \brief A generator for Qt Installer Framework tools
  *
diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.h b/Source/CPack/IFW/cmCPackIFWInstaller.h
index 4956f69..02cd07b 100644
--- a/Source/CPack/IFW/cmCPackIFWInstaller.h
+++ b/Source/CPack/IFW/cmCPackIFWInstaller.h
@@ -13,8 +13,7 @@
 #ifndef cmCPackIFWInstaller_h
 #define cmCPackIFWInstaller_h
 
-#include <map>
-#include <string>
+#include "cmStandardIncludes.h"
 
 class cmCPackIFWPackage;
 class cmCPackIFWGenerator;
diff --git a/Source/CPack/IFW/cmCPackIFWPackage.h b/Source/CPack/IFW/cmCPackIFWPackage.h
index e58a78a..868c15d 100644
--- a/Source/CPack/IFW/cmCPackIFWPackage.h
+++ b/Source/CPack/IFW/cmCPackIFWPackage.h
@@ -13,9 +13,7 @@
 #ifndef cmCPackIFWPackage_h
 #define cmCPackIFWPackage_h
 
-#include <string>
-#include <vector>
-#include <set>
+#include "cmStandardIncludes.h"
 
 class cmCPackComponent;
 class cmCPackComponentGroup;

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

Summary of changes:
 Source/CPack/IFW/cmCPackIFWGenerator.h |    2 --
 Source/CPack/IFW/cmCPackIFWInstaller.h |    3 +--
 Source/CPack/IFW/cmCPackIFWPackage.h   |    4 +---
 3 files changed, 2 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake