diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Help/variable/CMAKE_LANG_COMPILER_VERSION.rst | 4 | ||||
| -rw-r--r-- | Utilities/cmlibuv/CMakeLists.txt | 21 | ||||
| -rwxr-xr-x | bootstrap | 28 |
4 files changed, 25 insertions, 31 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eb46c3b..ed924eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -536,9 +536,6 @@ int main(void) { return 0; } if(NOT HAVE_CoreServices_OS_X_10_5) set(CMAKE_USE_LIBUV 0) endif() - elseif(CYGWIN) - # libuv does not support Cygwin - set(CMAKE_USE_LIBUV 0) elseif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX") # Disable until it can be ported. set(CMAKE_USE_LIBUV 0) diff --git a/Help/variable/CMAKE_LANG_COMPILER_VERSION.rst b/Help/variable/CMAKE_LANG_COMPILER_VERSION.rst index 50e77eb..27b0cad 100644 --- a/Help/variable/CMAKE_LANG_COMPILER_VERSION.rst +++ b/Help/variable/CMAKE_LANG_COMPILER_VERSION.rst @@ -6,3 +6,7 @@ Compiler version string. Compiler version in major[.minor[.patch[.tweak]]] format. This variable is not guaranteed to be defined for all compilers or languages. + +For example ``CMAKE_C_COMPILER_VERSION`` and +``CMAKE_CXX_COMPILER_VERSION`` might indicate the respective C and C++ +compiler version. diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt index 3252e3d..4c8e228 100644 --- a/Utilities/cmlibuv/CMakeLists.txt +++ b/Utilities/cmlibuv/CMakeLists.txt @@ -133,6 +133,27 @@ if(CMAKE_SYSTEM_NAME STREQUAL "AIX") ) endif() +if(CMAKE_SYSTEM_NAME MATCHES "CYGWIN") + list(APPEND uv_libraries + ) + list(APPEND uv_headers + include/uv-posix.h + ) + list(APPEND uv_defines + ) + list(APPEND uv_sources + src/unix/cygwin.c + src/unix/bsd-ifaddrs.c + src/unix/no-fsevents.c + src/unix/no-proctitle.c + src/unix/posix-hrtime.c + src/unix/posix-poll.c + src/unix/procfs-exepath.c + src/unix/sysinfo-loadavg.c + src/unix/sysinfo-memory.c + ) +endif() + if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") list(APPEND uv_headers include/uv-darwin.h @@ -1111,34 +1111,6 @@ rm -f "${TMPFILE}.cxx" if [ "x${cmake_cxx_compiler_is_gnu}" != "x1" ]; then # Check for non-GNU compiler flags - # If we are on IRIX, check for -LANG:std - cmake_test_flags="-LANG:std" - if [ "x${cmake_system}" = "xIRIX64" ]; then - TMPFILE=`cmake_tmp_file` - echo ' - #include <iostream> - int main() { std::cout << "No need for '"${cmake_test_flags}"'" << std::endl; return 0;} -' > ${TMPFILE}.cxx - cmake_need_lang_std=0 - if cmake_try_run "${cmake_cxx_compiler}" \ - "${cmake_cxx_flags}" "${TMPFILE}.cxx" >> cmake_bootstrap.log 2>&1; then - : - else - if cmake_try_run "${cmake_cxx_compiler}" \ - "${cmake_cxx_flags} ${cmake_test_flags}" "${TMPFILE}.cxx" >> cmake_bootstrap.log 2>&1; then - cmake_need_lang_std=1 - fi - fi - if [ "x${cmake_need_lang_std}" = "x1" ]; then - cmake_cxx_flags="${cmake_cxx_flags} ${cmake_test_flags}" - echo "${cmake_cxx_compiler} needs ${cmake_test_flags}" - else - echo "${cmake_cxx_compiler} does not need ${cmake_test_flags}" - fi - rm -f "${TMPFILE}.cxx" - fi - cmake_test_flags= - # If we are on OSF, check for -timplicit_local -no_implicit_include cmake_test_flags="-timplicit_local -no_implicit_include" if [ "x${cmake_system}" = "xOSF1" ]; then |