[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-490-g63a718a
Kitware Robot
kwrobot at kitware.com
Tue Mar 14 18:35:05 EDT 2017
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 63a718a5b0780c7e71974a75cd944956b694f280 (commit)
via 4b49c9a245db870ab2359495083a6839be3ed9df (commit)
from c553e117d5c0d8111e3f4e75ebf6706a0fa0e04d (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=63a718a5b0780c7e71974a75cd944956b694f280
commit 63a718a5b0780c7e71974a75cd944956b694f280
Merge: c553e11 4b49c9a
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Tue Mar 14 22:25:55 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Mar 14 18:26:05 2017 -0400
Stage topic 'windows-include-order'
Topic-id: 23061
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/584
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b49c9a245db870ab2359495083a6839be3ed9df
commit 4b49c9a245db870ab2359495083a6839be3ed9df
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Mon Mar 6 17:52:56 2017 +0100
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Tue Mar 14 22:40:11 2017 +0100
fix include order of windows.h
Comments that indicate a special include order is necessary because
GetCurrentDirectory might get redefined are outdated. Remove those
outdated comments and use the normal ordering of includes.
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 8102276..09c01e9 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -279,7 +279,6 @@ bool cmExportCommand::HandlePackage(std::vector<std::string> const& args)
#if defined(_WIN32) && !defined(__CYGWIN__)
#include <windows.h>
-#undef GetCurrentDirectory
void cmExportCommand::ReportRegistryError(std::string const& msg,
std::string const& key, long err)
{
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 4b29837..fe4cc54 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1173,7 +1173,6 @@ void cmFindPackageCommand::FillPrefixesSystemRegistry()
#if defined(_WIN32) && !defined(__CYGWIN__)
#include <windows.h>
-#undef GetCurrentDirectory
// http://msdn.microsoft.com/en-us/library/aa384253%28v=vs.85%29.aspx
#if !defined(KEY_WOW64_32KEY)
#define KEY_WOW64_32KEY 0x0200
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 1f5e624..0d53bf7 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1,12 +1,5 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
-#if defined(_WIN32) && !defined(__CYGWIN__)
-#include "windows.h" // this must be first to define GetCurrentDirectory
-#if defined(_MSC_VER) && _MSC_VER >= 1800
-#define KWSYS_WINDOWS_DEPRECATED_GetVersionEx
-#endif
-#endif
-
#include "cmGlobalGenerator.h"
#include <algorithm>
@@ -19,6 +12,10 @@
#include <stdlib.h>
#include <string.h>
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#include <windows.h>
+#endif
+
#include "cmAlgorithms.h"
#include "cmCPackPropertiesGenerator.h"
#include "cmComputeTargetDepends.h"
@@ -51,6 +48,10 @@
#include <cm_jsoncpp_writer.h>
#endif
+#if defined(_MSC_VER) && _MSC_VER >= 1800
+#define KWSYS_WINDOWS_DEPRECATED_GetVersionEx
+#endif
+
const std::string kCMAKE_PLATFORM_INFO_INITIALIZED =
"CMAKE_PLATFORM_INFO_INITIALIZED";
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 65a0bde..e7fb203 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -1,7 +1,5 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
-#include "windows.h" // this must be first to define GetCurrentDirectory
-
#include "cmGlobalVisualStudio7Generator.h"
#include "cmGeneratedFileStream.h"
@@ -14,6 +12,7 @@
#include <cmsys/Encoding.hxx>
#include <assert.h>
+#include <windows.h>
static cmVS7FlagTable cmVS7ExtraFlagTable[] = {
// Precompiled header and related options. Note that the
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index a073426..81d9765 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -5,6 +5,7 @@
#include <cmsys/Encoding.hxx>
#include <iostream>
+#include <windows.h>
#include "cmAlgorithms.h"
#include "cmCallVisualStudioMacro.h"
@@ -441,8 +442,6 @@ std::string cmGlobalVisualStudioGenerator::GetStartupProjectName(
return this->GetAllTargetName();
}
-#include <windows.h>
-
bool IsVisualStudioMacrosFileRegistered(const std::string& macrosFile,
const std::string& regKeyBase,
std::string& nextAvailableSubKeyName)
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 8026de9..f8490bf 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -16,6 +16,7 @@
#include "cmGeneratedFileStream.h"
#include <ctype.h> // for isspace
+#include <windows.h>
static bool cmLVS7G_IsFAT(const char* dir);
@@ -2115,7 +2116,6 @@ std::string cmLocalVisualStudio7Generator::GetTargetDirectory(
return dir;
}
-#include <windows.h>
static bool cmLVS7G_IsFAT(const char* dir)
{
if (dir[0] && dir[1] == ':') {
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index b8e227f..805a9f7 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -1,11 +1,6 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
-// include these first, otherwise there will be problems on Windows
-// with GetCurrentDirectory() being redefined
-#ifdef CMAKE_BUILD_WITH_CMAKE
-#include "cmDocumentation.h"
-#include "cmDynamicLoader.h"
-#endif
+#include <cmConfigure.h>
#include "cmAlgorithms.h"
#include "cmDocumentationEntry.h"
@@ -17,7 +12,11 @@
#include "cmake.h"
#include "cmcmd.h"
-#include <cmConfigure.h>
+#ifdef CMAKE_BUILD_WITH_CMAKE
+#include "cmDocumentation.h"
+#include "cmDynamicLoader.h"
+#endif
+
#include <cmsys/Encoding.hxx>
#if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE)
#include <cmsys/ConsoleBuf.hxx>
-----------------------------------------------------------------------
Summary of changes:
Source/cmExportCommand.cxx | 1 -
Source/cmFindPackageCommand.cxx | 1 -
Source/cmGlobalGenerator.cxx | 15 ++++++++-------
Source/cmGlobalVisualStudio7Generator.cxx | 3 +--
Source/cmGlobalVisualStudioGenerator.cxx | 3 +--
Source/cmLocalVisualStudio7Generator.cxx | 2 +-
Source/cmakemain.cxx | 13 ++++++-------
7 files changed, 17 insertions(+), 21 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list