diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-11 14:58:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-01-11 14:58:49 (GMT) |
| commit | bc2cc80255c64bc2b2fa4c9dbb54f5cd90150982 (patch) | |
| tree | 5f2a0ef3dc33f74c851b794c3b12e67239dfba5c | |
| parent | 474edf75f6234a9ed3b59b7e11c53d57f9bd2f78 (diff) | |
| parent | b7f0b1240f9c251d059fafcde878168f2b9a6664 (diff) | |
| download | CMake-bc2cc80255c64bc2b2fa4c9dbb54f5cd90150982.zip CMake-bc2cc80255c64bc2b2fa4c9dbb54f5cd90150982.tar.gz CMake-bc2cc80255c64bc2b2fa4c9dbb54f5cd90150982.tar.bz2 | |
Merge topic 'solaris-build-fixes'
b7f0b124 libuv requires _XOPEN_SOURCE 600 on Solaris 11
ba8bb321 Disable libuv on Solaris 10
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Utilities/cmlibuv/CMakeLists.txt | 10 |
2 files changed, 12 insertions, 1 deletions
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) 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 ) |