diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-03-06 16:52:56 (GMT) |
|---|---|---|
| committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-03-14 21:40:11 (GMT) |
| commit | 4b49c9a245db870ab2359495083a6839be3ed9df (patch) | |
| tree | 3d0dc5ae9ad2b46d6658b207bfef50ce28774e34 /Source/cmGlobalGenerator.cxx | |
| parent | 4d3f120c5fec71b12e8d1cab1e509e2545012475 (diff) | |
| download | CMake-4b49c9a245db870ab2359495083a6839be3ed9df.zip CMake-4b49c9a245db870ab2359495083a6839be3ed9df.tar.gz CMake-4b49c9a245db870ab2359495083a6839be3ed9df.tar.bz2 | |
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.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
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"; |