[Cmake-commits] CMake branch, master, updated. v3.8.1-1344-gbd9ec9d
Kitware Robot
kwrobot at kitware.com
Tue May 30 09:35:03 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via bd9ec9d1d07c4a24f537264e06c735c7a8b33810 (commit)
via cf70c1efb1b47cba7adcef0d536fc4aa6f3a3593 (commit)
via 7bd63e4d6d700e1d2c69034b97d54ba941a600ba (commit)
via 39fc348f5779cdb7892aa70435fa0b8e04539964 (commit)
via 7a9a1e04530a7b4ae8fc8fa0bbe8ae1da67fa7f2 (commit)
via a9eaefaa1ef77bcfb1ee563e4312b2fe01784df5 (commit)
from 3ed14cb3ac03e7df53b9f9f987d5180e74dc2b64 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd9ec9d1d07c4a24f537264e06c735c7a8b33810
commit bd9ec9d1d07c4a24f537264e06c735c7a8b33810
Merge: cf70c1e 39fc348
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 30 13:27:04 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 30 09:27:38 2017 -0400
Merge topic 'bootstrap-drop-irix'
39fc348f bootstrap: remove support for IRIX
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !903
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf70c1efb1b47cba7adcef0d536fc4aa6f3a3593
commit cf70c1efb1b47cba7adcef0d536fc4aa6f3a3593
Merge: 7bd63e4 a9eaefa
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 30 13:26:11 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 30 09:27:07 2017 -0400
Merge topic 'libuv-cygwin'
a9eaefaa Build with libuv on Cygwin to enable server-mode
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !901
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bd63e4d6d700e1d2c69034b97d54ba941a600ba
commit 7bd63e4d6d700e1d2c69034b97d54ba941a600ba
Merge: 3ed14cb 7a9a1e0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 30 13:25:56 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 30 09:26:20 2017 -0400
Merge topic '16917-c-compiler-version-variable-hint'
7a9a1e04 Help: Add a hint about C and C++ compiler version variable
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !902
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39fc348f5779cdb7892aa70435fa0b8e04539964
commit 39fc348f5779cdb7892aa70435fa0b8e04539964
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun May 28 23:37:49 2017 +0200
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Sun May 28 23:37:49 2017 +0200
bootstrap: remove support for IRIX
diff --git a/bootstrap b/bootstrap
index b1f8670..0e76f4a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -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
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a9a1e04530a7b4ae8fc8fa0bbe8ae1da67fa7f2
commit 7a9a1e04530a7b4ae8fc8fa0bbe8ae1da67fa7f2
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun May 28 20:16:31 2017 +0200
Commit: Gregor Jasny <gjasny at googlemail.com>
CommitDate: Sun May 28 20:19:53 2017 +0200
Help: Add a hint about C and C++ compiler version variable
Closes #16917
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.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9eaefaa1ef77bcfb1ee563e4312b2fe01784df5
commit a9eaefaa1ef77bcfb1ee563e4312b2fe01784df5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 26 18:51:50 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Sun May 28 09:05:57 2017 -0400
Build with libuv on Cygwin to enable server-mode
With our last update of libuv, Cygwin is now supported.
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/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
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 3 ---
Help/variable/CMAKE_LANG_COMPILER_VERSION.rst | 4 ++++
Utilities/cmlibuv/CMakeLists.txt | 21 +++++++++++++++++++
bootstrap | 28 -------------------------
4 files changed, 25 insertions(+), 31 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list