diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-14 19:10:20 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-14 19:10:20 (GMT) |
| commit | 8e32bebd8d3e3010240f8187a84e1c2513840920 (patch) | |
| tree | ae1fd45e20441da719607fefe2913603798c6fb6 /Source | |
| parent | fdacfc6604c09e11ef2dd7bc8c4da8dfab9a8244 (diff) | |
| parent | 871adefce97246ec42a157f62e39855b434c523d (diff) | |
| download | CMake-8e32bebd8d3e3010240f8187a84e1c2513840920.zip CMake-8e32bebd8d3e3010240f8187a84e1c2513840920.tar.gz CMake-8e32bebd8d3e3010240f8187a84e1c2513840920.tar.bz2 | |
Merge branch 'libuv-restore-fmode' into release-3.9
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmakemain.cxx | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index 6e65955..c5a6836 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -27,6 +27,10 @@ #include <vector> #ifdef CMAKE_USE_LIBUV +#ifdef _WIN32 +#include <fcntl.h> /* _O_TEXT */ +#include <stdlib.h> /* _set_fmode, _fmode */ +#endif #include "cm_uv.h" #endif @@ -168,6 +172,18 @@ int main(int ac, char const* const* av) ac = args.argc(); av = args.argv(); +#if defined(CMAKE_USE_LIBUV) && defined(_WIN32) + // Perform libuv one-time initialization now, and then un-do its + // global _fmode setting so that using libuv does not change the + // default file text/binary mode. See libuv issue 840. + uv_loop_close(uv_default_loop()); +#ifdef _MSC_VER + _set_fmode(_O_TEXT); +#else + _fmode = _O_TEXT; +#endif +#endif + cmSystemTools::EnableMSVCDebugHook(); cmSystemTools::FindCMakeResources(av[0]); if (ac > 1) { |