summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-09-28 12:39:19 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-09-28 12:39:54 (GMT)
commit13e0a0d74e81e6bebfc6484008193465ac2f533b (patch)
tree18e8aa742d3bc760500c597553e016aed338c9b0
parentb050fe532fb46435af63c830ec6b2dcb64eefcea (diff)
parentf9e950d4c5e8b7ecd5418dacfd5d6be500e6d738 (diff)
downloadCMake-13e0a0d74e81e6bebfc6484008193465ac2f533b.zip
CMake-13e0a0d74e81e6bebfc6484008193465ac2f533b.tar.gz
CMake-13e0a0d74e81e6bebfc6484008193465ac2f533b.tar.bz2
Merge topic 'libuv-qnx'
f9e950d4c5 libuv: Add support for building for QNX within CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5200
-rw-r--r--Source/cmSystemTools.cxx3
-rw-r--r--Source/cmTimestamp.cxx3
-rw-r--r--Utilities/cmlibuv/CMakeLists.txt18
-rwxr-xr-xbootstrap4
4 files changed, 26 insertions, 2 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index fbf4ceb..1e625a4 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -5,7 +5,8 @@
// POSIX APIs are needed
# define _POSIX_C_SOURCE 200809L
#endif
-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || \
+ defined(__QNX__)
// For isascii
# define _XOPEN_SOURCE 700
#endif
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index bd6bb3d..67f7e11 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -5,7 +5,8 @@
// POSIX APIs are needed
# define _POSIX_C_SOURCE 200809L
#endif
-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || \
+ defined(__QNX__)
// For isascii
# define _XOPEN_SOURCE 700
#endif
diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt
index 7625cf6..92d2411 100644
--- a/Utilities/cmlibuv/CMakeLists.txt
+++ b/Utilities/cmlibuv/CMakeLists.txt
@@ -336,6 +336,24 @@ if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
)
endif()
+if(CMAKE_SYSTEM_NAME STREQUAL "QNX")
+ list(APPEND uv_headers
+ include/uv/posix.h
+ )
+ list(APPEND uv_defines
+ _XOPEN_SOURCE=700
+ )
+ list(APPEND uv_sources
+ src/unix/posix-hrtime.c
+ src/unix/posix-poll.c
+ src/unix/no-fsevents.c
+ src/unix/no-proctitle.c
+ )
+ list(APPEND uv_libraries
+ socket
+ )
+endif()
+
include_directories(
${uv_includes}
${KWSYS_HEADER_ROOT}
diff --git a/bootstrap b/bootstrap
index 1e161db..feccde9 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1675,6 +1675,10 @@ else
uv_c_flags="${uv_c_flags} -D__EXTENSIONS__ -D_XOPEN_SOURCE=600"
libs="${libs} -lkstat -lnsl -lsendfile -lsocket -lrt"
;;
+ *QNX*)
+ uv_c_flags="${uv_c_flags} -D_XOPEN_SOURCE=700"
+ libs="${libs} -lsocket"
+ ;;
esac
fi
if test "x${bootstrap_system_libuv}" = "x"; then