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, next has been updated
via 31e1ebf7015852bae9dbc5204e37534ae29c8548 (commit)
via b7f0b1240f9c251d059fafcde878168f2b9a6664 (commit)
via ba8bb32162ae7bc42c4a3a521a4e4b98274d9d8e (commit)
from 63a8770f08d0bcb239ceaaa18f5a6ee99af38be2 (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=31e1ebf7015852bae9dbc5204e37534ae29c8548
commit 31e1ebf7015852bae9dbc5204e37534ae29c8548
Merge: 63a8770 b7f0b12
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jan 10 12:51:31 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 10 12:51:31 2017 -0500
Merge topic 'solaris-build-fixes' into next
b7f0b124 libuv requires _XOPEN_SOURCE 600 on Solaris 11
ba8bb321 Disable libuv on Solaris 10
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7f0b1240f9c251d059fafcde878168f2b9a6664
commit b7f0b1240f9c251d059fafcde878168f2b9a6664
Author: Eric Berge <eric.be...@quantum.com>
AuthorDate: Wed Dec 21 15:38:28 2016 -0600
Commit: Eric Berge <eric.be...@quantum.com>
CommitDate: Wed Dec 21 22:11:28 2016 -0600
libuv requires _XOPEN_SOURCE 600 on Solaris 11
This avoid build errors from the
/usr/include/sys/feature_tests.h
include file which disallows setting XOpen
versions less than 6 when in C99 mode.
diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt
index 1b384b5..a8e25ba 100644
--- a/Utilities/cmlibuv/CMakeLists.txt
+++ b/Utilities/cmlibuv/CMakeLists.txt
@@ -218,8 +218,16 @@ if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
)
list(APPEND uv_defines
__EXTENSIONS__
- _XOPEN_SOURCE=500
)
+ if(CMAKE_SYSTEM_VERSION STREQUAL "5.10")
+ list(APPEND uv_defines
+ _XOPEN_SOURCE=500
+ )
+ else()
+ list(APPEND uv_defines
+ _XOPEN_SOURCE=600
+ )
+ endif()
list(APPEND uv_sources
src/unix/sunos.c
)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba8bb32162ae7bc42c4a3a521a4e4b98274d9d8e
commit ba8bb32162ae7bc42c4a3a521a4e4b98274d9d8e
Author: Eric Berge <eric.be...@quantum.com>
AuthorDate: Wed Dec 21 15:34:11 2016 -0600
Commit: Eric Berge <eric.be...@quantum.com>
CommitDate: Wed Dec 21 15:34:11 2016 -0600
Disable libuv on Solaris 10
Two issues need to be resolved to add Solaris 10
libuv support:
1. libuv needs to provide alternative functionality
for systems that do not support mkdtemp()
2. cmake should set SUNOS_NO_IFADDRS for Solaris 10
builds (but not Solaris 11)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7aa8010..bec81a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -510,6 +510,9 @@ int main(void) { return 0; }
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
# Disable until it can be ported.
set(CMAKE_USE_LIBUV 0)
+ elseif(CMAKE_SYSTEM STREQUAL "SunOS-5.10")
+ # Disable until it can be ported.
+ set(CMAKE_USE_LIBUV 0)
endif()
endif()
if(CMAKE_USE_LIBUV)
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 3 +++
Utilities/cmlibuv/CMakeLists.txt | 10 +++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
