diff options
| author | Brad King <brad.king@kitware.com> | 2019-09-20 14:38:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-09-20 14:38:43 (GMT) |
| commit | ebb9346490741ddc2ce6f552bc1be57dfc730cfa (patch) | |
| tree | 63abd0be387f587977d0026affc0f901ac91e02e /Source/cmake.cxx | |
| parent | df0586d8d5c99d870369f1f60f63431deb98a6ba (diff) | |
| parent | 4a08690ccf01dc36d44a55d1645d8281909ea092 (diff) | |
| download | CMake-ebb9346490741ddc2ce6f552bc1be57dfc730cfa.zip CMake-ebb9346490741ddc2ce6f552bc1be57dfc730cfa.tar.gz CMake-ebb9346490741ddc2ce6f552bc1be57dfc730cfa.tar.bz2 | |
Merge topic 'cmake-system-headers'
4a08690ccf cmstd: Extend header <cm/iterator>
c688b401d3 cmstd: Modernize CMake system headers
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3776
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 9a66805..96d903e 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -2,7 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmake.h" -#include "cm_memory.hxx" +#include <cm/memory> +#include <cm/string_view> +#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(CMAKE_BOOT_MINGW) +# include <cm/iterator> +#endif + +#include "cm_sys_stat.h" #include "cmAlgorithms.h" #include "cmCommands.h" @@ -28,8 +34,6 @@ #include "cmUtils.hxx" #include "cmVersionConfig.h" #include "cmWorkingDirectory.h" -#include "cm_string_view.hxx" -#include "cm_sys_stat.h" #if !defined(CMAKE_BOOTSTRAP) # include "cm_jsoncpp_writer.h" |