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/cmakemain.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/cmakemain.cxx')
| -rw-r--r-- | Source/cmakemain.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
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> |