diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-02 11:53:33 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-02 11:53:43 (GMT) |
| commit | d57c1a5b3116d1df1bd5a7c2d9857e7b96d2a4f4 (patch) | |
| tree | 70119086f84badda59d3df7b35ab1dd59155794c /Source/cmGlobalGenerator.h | |
| parent | a4f404d0a5bdb7ce2c403ab65b208703985c4280 (diff) | |
| parent | ed98209ddc8d5e9f5b20cd010c69a25d553b2654 (diff) | |
| download | CMake-d57c1a5b3116d1df1bd5a7c2d9857e7b96d2a4f4.zip CMake-d57c1a5b3116d1df1bd5a7c2d9857e7b96d2a4f4.tar.gz CMake-d57c1a5b3116d1df1bd5a7c2d9857e7b96d2a4f4.tar.bz2 | |
Merge topic 'clang-format-normalize-headers-presentation'
ed98209ddc Revise include order using clang-format-6.0
185fe49f29 clang-format: Normalize headers presentation
42ef28b4f3 Remove unused uid_t/gid_t types on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sebastian Holtermann <sebholt@web.de>
Merge-request: !3851
Diffstat (limited to 'Source/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index eb5ee27..b7a8ac7 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -14,6 +14,8 @@ #include <utility> #include <vector> +#include "cm_codecvt.hxx" + #include "cmAlgorithms.h" #include "cmCustomCommandLines.h" #include "cmDuration.h" @@ -23,11 +25,11 @@ #include "cmSystemTools.h" #include "cmTarget.h" #include "cmTargetDepend.h" -#include "cm_codecvt.hxx" #if !defined(CMAKE_BOOTSTRAP) -# include "cmFileLockPool.h" # include "cm_jsoncpp_value.h" + +# include "cmFileLockPool.h" #endif #define CMAKE_DIRECTORY_ID_SEP "::@" |