diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-18 14:08:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-18 14:08:07 (GMT) |
| commit | dd77a2ed4d0760232cf73977be3cb9dfde2dacb4 (patch) | |
| tree | 9fb6a1a296b49fadf7ee5b5d08a9c3155f6f7b91 /Source | |
| parent | ce4f6354096921f7e32d6354d6550ff5724659ab (diff) | |
| parent | 714ce728828c267da9a5c0d9f2e48eb5f88a8336 (diff) | |
| download | CMake-dd77a2ed4d0760232cf73977be3cb9dfde2dacb4.zip CMake-dd77a2ed4d0760232cf73977be3cb9dfde2dacb4.tar.gz CMake-dd77a2ed4d0760232cf73977be3cb9dfde2dacb4.tar.bz2 | |
Merge topic 'libuv-bootstrap'
714ce728 bootstrap: Make libuv available during bootstrap
6a2d967d bootstrap: Require compiler mode aware of C99 on Solaris
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1131
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmakemain.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index 09dcb6d..219a658 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -14,12 +14,13 @@ #ifdef CMAKE_BUILD_WITH_CMAKE #include "cmDocumentation.h" #include "cmDynamicLoader.h" +#endif + #ifdef _WIN32 #include <fcntl.h> /* _O_TEXT */ #include <stdlib.h> /* _set_fmode, _fmode */ #endif #include "cm_uv.h" -#endif #include "cmsys/Encoding.hxx" #if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE) @@ -167,7 +168,7 @@ int main(int ac, char const* const* av) ac = args.argc(); av = args.argv(); -#if defined(CMAKE_BUILD_WITH_CMAKE) && defined(_WIN32) +#if 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. @@ -192,8 +193,8 @@ int main(int ac, char const* const* av) int ret = do_cmake(ac, av); #ifdef CMAKE_BUILD_WITH_CMAKE cmDynamicLoader::FlushCache(); - uv_loop_close(uv_default_loop()); #endif + uv_loop_close(uv_default_loop()); return ret; } |