diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-11 13:16:59 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-11 13:17:04 (GMT) |
| commit | 73657a35e6f64e530e8bbda90757c3762d7c36c6 (patch) | |
| tree | abab746a3c96c49f528c31162237c1b6b8c7e540 /Source | |
| parent | 1d51fcaeafeb9bfcdf3bc871d2b875446df081e8 (diff) | |
| parent | 88c9878af9d6d4b8cd3c7358bfdd12206c8aadb4 (diff) | |
| download | CMake-73657a35e6f64e530e8bbda90757c3762d7c36c6.zip CMake-73657a35e6f64e530e8bbda90757c3762d7c36c6.tar.gz CMake-73657a35e6f64e530e8bbda90757c3762d7c36c6.tar.bz2 | |
Merge topic 'libuv-required'
88c9878a Make libuv available to all parts of CMake
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1104
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmConfigure.cmake.h.in | 1 | ||||
| -rw-r--r-- | Source/cmakemain.cxx | 17 |
2 files changed, 6 insertions, 12 deletions
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in index 524fdf8..302000a 100644 --- a/Source/cmConfigure.cmake.h.in +++ b/Source/cmConfigure.cmake.h.in @@ -19,7 +19,6 @@ #cmakedefine HAVE_UNSETENV #cmakedefine CMAKE_USE_ELF_PARSER #cmakedefine CMAKE_USE_MACH_PARSER -#cmakedefine CMAKE_USE_LIBUV #cmakedefine CMake_HAVE_CXX_AUTO_PTR #cmakedefine CMake_HAVE_CXX_EQ_DELETE #cmakedefine CMake_HAVE_CXX_FALLTHROUGH diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index c5a6836..dd88083 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -15,6 +15,11 @@ #ifdef CMAKE_BUILD_WITH_CMAKE #include "cmDocumentation.h" #include "cmDynamicLoader.h" +#ifdef _WIN32 +#include <fcntl.h> /* _O_TEXT */ +#include <stdlib.h> /* _set_fmode, _fmode */ +#endif +#include "cm_uv.h" #endif #include "cmsys/Encoding.hxx" @@ -26,14 +31,6 @@ #include <string> #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 - #ifdef CMAKE_BUILD_WITH_CMAKE static const char* cmDocumentationName[][2] = { { CM_NULLPTR, " cmake - Cross-Platform Makefile Generator." }, @@ -172,7 +169,7 @@ int main(int ac, char const* const* av) ac = args.argc(); av = args.argv(); -#if defined(CMAKE_USE_LIBUV) && defined(_WIN32) +#if defined(CMAKE_BUILD_WITH_CMAKE) && 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. @@ -197,8 +194,6 @@ int main(int ac, char const* const* av) int ret = do_cmake(ac, av); #ifdef CMAKE_BUILD_WITH_CMAKE cmDynamicLoader::FlushCache(); -#endif -#ifdef CMAKE_USE_LIBUV uv_loop_close(uv_default_loop()); #endif return ret; |