summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Source/CMakeLists.txt5
-rw-r--r--Source/CMakeVersion.cmake2
-rw-r--r--Source/cmArchiveWrite.cxx6
-rw-r--r--Source/cmArchiveWrite.h14
-rw-r--r--Source/cmCLocaleEnvironmentScope.cxx1
-rw-r--r--Source/cmCLocaleEnvironmentScope.h5
-rw-r--r--Source/cmCPackPropertiesGenerator.cxx7
-rw-r--r--Source/cmCPackPropertiesGenerator.h8
-rw-r--r--Source/cmCacheManager.cxx6
-rw-r--r--Source/cmCacheManager.h10
-rw-r--r--Source/cmCommands.h2
-rw-r--r--Source/cmCommonTargetGenerator.cxx10
-rw-r--r--Source/cmCommonTargetGenerator.h8
-rw-r--r--Source/cmComputeComponentGraph.h3
-rw-r--r--Source/cmComputeLinkDepends.cxx9
-rw-r--r--Source/cmComputeLinkDepends.h9
-rw-r--r--Source/cmComputeLinkInformation.cxx12
-rw-r--r--Source/cmComputeLinkInformation.h10
-rw-r--r--Source/cmComputeTargetDepends.cxx11
-rw-r--r--Source/cmComputeTargetDepends.h9
-rw-r--r--Utilities/cmlibarchive/libarchive/xxhash.c5
21 files changed, 117 insertions, 35 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index b68675d..e63bf5a 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -45,9 +45,12 @@ endif()
set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR})
-# ensure Unicode friendly APIs are used on Windows
if(WIN32)
+ # ensure Unicode friendly APIs are used on Windows
add_definitions(-DUNICODE -D_UNICODE)
+
+ # minimize windows.h content
+ add_definitions(-DWIN32_LEAN_AND_MEAN)
endif()
# configure the .dox.in file
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index ca31b76..da0aba0 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
# CMake version number components.
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 6)
-set(CMake_VERSION_PATCH 20160818)
+set(CMake_VERSION_PATCH 20160823)
#set(CMake_VERSION_RC 1)
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index df07ccc..8869040 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -16,7 +16,11 @@
#include "cm_get_date.h"
#include <cm_libarchive.h>
#include <cmsys/Directory.hxx>
+#include <cmsys/Encoding.hxx>
#include <cmsys/FStream.hxx>
+#include <iostream>
+#include <string.h>
+#include <time.h>
#ifndef __LA_SSIZE_T
#define __LA_SSIZE_T la_ssize_t
@@ -267,7 +271,7 @@ bool cmArchiveWrite::AddFile(const char* file, size_t skip, const char* prefix)
}
if (this->PermissionsMask.IsSet()) {
- mode_t perm = archive_entry_perm(e);
+ int perm = archive_entry_perm(e);
archive_entry_set_perm(e, perm & this->PermissionsMask.Get());
}
diff --git a/Source/cmArchiveWrite.h b/Source/cmArchiveWrite.h
index f847d09..120453b 100644
--- a/Source/cmArchiveWrite.h
+++ b/Source/cmArchiveWrite.h
@@ -12,7 +12,11 @@
#ifndef cmArchiveWrite_h
#define cmArchiveWrite_h
-#include "cmStandardIncludes.h"
+#include <cmConfigure.h> // IWYU pragma: keep
+
+#include <iosfwd>
+#include <stddef.h>
+#include <string>
#if !defined(CMAKE_BUILD_WITH_CMAKE)
#error "cmArchiveWrite not allowed during bootstrap build!"
@@ -94,7 +98,7 @@ public:
void SetMTime(std::string const& t) { this->MTime = t; }
//! Sets the permissions of the added files/folders
- void SetPermissions(mode_t permissions_)
+ void SetPermissions(int permissions_)
{
this->Permissions.Set(permissions_);
}
@@ -107,7 +111,7 @@ public:
//! The permissions will be copied from the existing file
//! or folder. The mask will then be applied to unset
//! some of them
- void SetPermissionsMask(mode_t permissionsMask_)
+ void SetPermissionsMask(int permissionsMask_)
{
this->PermissionsMask.Set(permissionsMask_);
}
@@ -177,8 +181,8 @@ private:
//!@}
//! Permissions on files/folders
- cmArchiveWriteOptional<mode_t> Permissions;
- cmArchiveWriteOptional<mode_t> PermissionsMask;
+ cmArchiveWriteOptional<int> Permissions;
+ cmArchiveWriteOptional<int> PermissionsMask;
};
#endif
diff --git a/Source/cmCLocaleEnvironmentScope.cxx b/Source/cmCLocaleEnvironmentScope.cxx
index e4c74ec..e38f531 100644
--- a/Source/cmCLocaleEnvironmentScope.cxx
+++ b/Source/cmCLocaleEnvironmentScope.cxx
@@ -15,6 +15,7 @@
#include "cmSystemTools.h"
#include <sstream>
+#include <utility>
cmCLocaleEnvironmentScope::cmCLocaleEnvironmentScope()
{
diff --git a/Source/cmCLocaleEnvironmentScope.h b/Source/cmCLocaleEnvironmentScope.h
index b011741..572beaf 100644
--- a/Source/cmCLocaleEnvironmentScope.h
+++ b/Source/cmCLocaleEnvironmentScope.h
@@ -13,7 +13,10 @@
#ifndef cmCLocaleEnvironmentScope_h
#define cmCLocaleEnvironmentScope_h
-#include "cmStandardIncludes.h"
+#include <cmConfigure.h> // IWYU pragma: keep
+
+#include <map>
+#include <string>
class cmCLocaleEnvironmentScope
{
diff --git a/Source/cmCPackPropertiesGenerator.cxx b/Source/cmCPackPropertiesGenerator.cxx
index af01c7d..ae6b0a1 100644
--- a/Source/cmCPackPropertiesGenerator.cxx
+++ b/Source/cmCPackPropertiesGenerator.cxx
@@ -1,8 +1,13 @@
#include "cmCPackPropertiesGenerator.h"
-#include "cmLocalGenerator.h"
+#include "cmGeneratorExpression.h"
+#include "cmInstalledFile.h"
#include "cmOutputConverter.h"
+#include <map>
+#include <ostream>
+#include <utility>
+
cmCPackPropertiesGenerator::cmCPackPropertiesGenerator(
cmLocalGenerator* lg, cmInstalledFile const& installedFile,
std::vector<std::string> const& configurations)
diff --git a/Source/cmCPackPropertiesGenerator.h b/Source/cmCPackPropertiesGenerator.h
index 4d092f6..77018b0 100644
--- a/Source/cmCPackPropertiesGenerator.h
+++ b/Source/cmCPackPropertiesGenerator.h
@@ -12,9 +12,15 @@
#ifndef cmCPackPropertiesGenerator_h
#define cmCPackPropertiesGenerator_h
-#include "cmInstalledFile.h"
+#include <cmConfigure.h> // IWYU pragma: keep
+
#include "cmScriptGenerator.h"
+#include <iosfwd>
+#include <string>
+#include <vector>
+
+class cmInstalledFile;
class cmLocalGenerator;
/** \class cmCPackPropertiesGenerator
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 2571698..39d96b4 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -16,10 +16,12 @@
#include "cmVersion.h"
#include "cmake.h"
-#include <cmsys/Directory.hxx>
+#include <algorithm>
#include <cmsys/FStream.hxx>
#include <cmsys/Glob.hxx>
-#include <cmsys/RegularExpression.hxx>
+#include <sstream>
+#include <stdio.h>
+#include <string.h>
cmCacheManager::cmCacheManager()
{
diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h
index 14e0f0a..3e32cf0 100644
--- a/Source/cmCacheManager.h
+++ b/Source/cmCacheManager.h
@@ -12,13 +12,19 @@
#ifndef cmCacheManager_h
#define cmCacheManager_h
-#include "cmStandardIncludes.h"
+#include <cmConfigure.h> // IWYU pragma: keep
#include "cmPropertyMap.h"
#include "cmState.h"
+#include <iosfwd>
+#include <map>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
+
class cmake;
-class cmMarkAsAdvancedCommand;
/** \class cmCacheManager
* \brief Control class for cmake's cache
diff --git a/Source/cmCommands.h b/Source/cmCommands.h
index d0f1ab7..034c9c7 100644
--- a/Source/cmCommands.h
+++ b/Source/cmCommands.h
@@ -12,7 +12,7 @@
#ifndef cmCommands_h
#define cmCommands_h
-#include "cmStandardIncludes.h"
+#include <cmConfigure.h> // IWYU pragma: keep
#include <vector>
diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 7ad18f0..6167e2c 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -11,13 +11,21 @@
============================================================================*/
#include "cmCommonTargetGenerator.h"
+#include <algorithm>
+#include <cmConfigure.h>
+#include <set>
+#include <sstream>
+#include <utility>
+
+#include "cmAlgorithms.h"
#include "cmComputeLinkInformation.h"
#include "cmGeneratorTarget.h"
#include "cmGlobalCommonGenerator.h"
#include "cmLocalCommonGenerator.h"
+#include "cmLocalGenerator.h"
#include "cmMakefile.h"
#include "cmSourceFile.h"
-#include "cmSystemTools.h"
+#include "cmState.h"
cmCommonTargetGenerator::cmCommonTargetGenerator(cmGeneratorTarget* gt)
: GeneratorTarget(gt)
diff --git a/Source/cmCommonTargetGenerator.h b/Source/cmCommonTargetGenerator.h
index 0bafde9..d3f9d64 100644
--- a/Source/cmCommonTargetGenerator.h
+++ b/Source/cmCommonTargetGenerator.h
@@ -12,9 +12,13 @@
#ifndef cmCommonTargetGenerator_h
#define cmCommonTargetGenerator_h
-#include "cmStandardIncludes.h"
+#include <cmConfigure.h> // IWYU pragma: keep
-#include "cmLocalGenerator.h"
+#include "cmOutputConverter.h"
+
+#include <map>
+#include <string>
+#include <vector>
class cmGeneratorTarget;
class cmGlobalCommonGenerator;
diff --git a/Source/cmComputeComponentGraph.h b/Source/cmComputeComponentGraph.h
index fb95f9a..cc468d9 100644
--- a/Source/cmComputeComponentGraph.h
+++ b/Source/cmComputeComponentGraph.h
@@ -12,11 +12,12 @@
#ifndef cmComputeComponentGraph_h
#define cmComputeComponentGraph_h
-#include "cmStandardIncludes.h"
+#include <cmConfigure.h> // IWYU pragma: keep
#include "cmGraphAdjacencyList.h"
#include <stack>
+#include <vector>
/** \class cmComputeComponentGraph
* \brief Analyze a graph to determine strongly connected components.
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index fffb77d..98405cf 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -13,13 +13,22 @@
#include "cmAlgorithms.h"
#include "cmComputeComponentGraph.h"
+#include "cmGeneratorTarget.h"
#include "cmGlobalGenerator.h"
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
+#include "cmState.h"
+#include "cmSystemTools.h"
#include "cmTarget.h"
#include "cmake.h"
+#include <algorithm>
#include <assert.h>
+#include <iterator>
+#include <sstream>
+#include <stdio.h>
+#include <string.h>
+#include <utility>
/*
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 4a33aff..7cd4140 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -12,17 +12,22 @@
#ifndef cmComputeLinkDepends_h
#define cmComputeLinkDepends_h
-#include "cmStandardIncludes.h"
+#include <cmConfigure.h> // IWYU pragma: keep
#include "cmGraphAdjacencyList.h"
#include "cmLinkItem.h"
+#include "cmTargetLinkLibraryType.h"
+#include <map>
#include <queue>
+#include <set>
+#include <string>
+#include <vector>
class cmComputeComponentGraph;
+class cmGeneratorTarget;
class cmGlobalGenerator;
class cmMakefile;
-class cmGeneratorTarget;
class cmake;
/** \class cmComputeLinkDepends
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 7db5df3..82877f3 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -11,19 +11,25 @@
============================================================================*/
#include "cmComputeLinkInformation.h"
-#include "cmComputeLinkDepends.h"
-#include "cmOrderDirectories.h"
-
#include "cmAlgorithms.h"
+#include "cmComputeLinkDepends.h"
#include "cmGeneratorTarget.h"
#include "cmGlobalGenerator.h"
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
+#include "cmOrderDirectories.h"
#include "cmOutputConverter.h"
+#include "cmPolicies.h"
#include "cmState.h"
+#include "cmSystemTools.h"
+#include "cmTarget.h"
#include "cmake.h"
+#include <algorithm>
#include <ctype.h>
+#include <sstream>
+#include <string.h>
+#include <utility>
//#define CM_COMPUTE_LINK_INFO_DEBUG
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index 023c781..7a67567 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -12,15 +12,19 @@
#ifndef cmComputeLinkInformation_h
#define cmComputeLinkInformation_h
-#include "cmStandardIncludes.h"
+#include <cmConfigure.h> // IWYU pragma: keep
#include <cmsys/RegularExpression.hxx>
+#include <iosfwd>
+#include <set>
+#include <string>
+#include <vector>
-class cmake;
+class cmGeneratorTarget;
class cmGlobalGenerator;
class cmMakefile;
-class cmGeneratorTarget;
class cmOrderDirectories;
+class cmake;
/** \class cmComputeLinkInformation
* \brief Compute link information for a target in one configuration.
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index ff7eb0b..dd07300 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -12,18 +12,25 @@
#include "cmComputeTargetDepends.h"
#include "cmComputeComponentGraph.h"
+#include "cmGeneratorTarget.h"
#include "cmGlobalGenerator.h"
+#include "cmLinkItem.h"
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
+#include "cmPolicies.h"
#include "cmSourceFile.h"
#include "cmState.h"
#include "cmSystemTools.h"
#include "cmTarget.h"
+#include "cmTargetDepend.h"
#include "cmake.h"
-#include <algorithm>
-
#include <assert.h>
+#include <sstream>
+#include <stdio.h>
+#include <utility>
+
+class cmListFileBacktrace;
/*
diff --git a/Source/cmComputeTargetDepends.h b/Source/cmComputeTargetDepends.h
index 9e51d4d..587ac66 100644
--- a/Source/cmComputeTargetDepends.h
+++ b/Source/cmComputeTargetDepends.h
@@ -12,16 +12,19 @@
#ifndef cmComputeTargetDepends_h
#define cmComputeTargetDepends_h
-#include "cmStandardIncludes.h"
+#include <cmConfigure.h> // IWYU pragma: keep
#include "cmGraphAdjacencyList.h"
-#include <stack>
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
class cmComputeComponentGraph;
+class cmGeneratorTarget;
class cmGlobalGenerator;
class cmLinkItem;
-class cmGeneratorTarget;
class cmTargetDependSet;
/** \class cmComputeTargetDepends
diff --git a/Utilities/cmlibarchive/libarchive/xxhash.c b/Utilities/cmlibarchive/libarchive/xxhash.c
index d7f8e96..262fecb 100644
--- a/Utilities/cmlibarchive/libarchive/xxhash.c
+++ b/Utilities/cmlibarchive/libarchive/xxhash.c
@@ -29,12 +29,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
You can contact the author at :
- xxHash source repository : http://code.google.com/p/xxhash/
*/
-#include <stdlib.h>
-#include <string.h>
#include "archive_platform.h"
#include "archive_xxhash.h"
+#include <stdlib.h>
+#include <string.h>
+
#ifdef HAVE_LIBLZ4
/***************************************
generated by cgit v0.12 at 2025-01-17 04:47:07 (GMT)