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 1a26a67702b90b0c49d7d110b1a12cbde09c0879 (commit)
via a833c24cebe193eb71bed11a6fe949525110dfd2 (commit)
via 43cb25764808b6a430b0497fe77eae4da5de2af7 (commit)
from 649479d0532d389aed1ac86aabf24884276dba3a (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=1a26a67702b90b0c49d7d110b1a12cbde09c0879
commit 1a26a67702b90b0c49d7d110b1a12cbde09c0879
Merge: 649479d a833c24
Author: Brad King <[email protected]>
AuthorDate: Mon Oct 22 16:44:47 2018 +0000
Commit: Kitware Robot <[email protected]>
CommitDate: Mon Oct 22 12:44:52 2018 -0400
Merge topic 'update-kwsys'
a833c24ceb Merge branch 'upstream-KWSys' into update-kwsys
43cb257648 KWSys 2018-10-19 (c2f29d2e)
Acked-by: Kitware Robot <[email protected]>
Merge-request: !2506
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a833c24cebe193eb71bed11a6fe949525110dfd2
commit a833c24cebe193eb71bed11a6fe949525110dfd2
Merge: fd02538 43cb257
Author: Brad King <[email protected]>
AuthorDate: Fri Oct 19 10:03:25 2018 -0400
Commit: Brad King <[email protected]>
CommitDate: Fri Oct 19 10:03:25 2018 -0400
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2018-10-19 (c2f29d2e)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43cb25764808b6a430b0497fe77eae4da5de2af7
commit 43cb25764808b6a430b0497fe77eae4da5de2af7
Author: KWSys Upstream <[email protected]>
AuthorDate: Fri Oct 19 10:02:23 2018 -0400
Commit: Brad King <[email protected]>
CommitDate: Fri Oct 19 10:03:25 2018 -0400
KWSys 2018-10-19 (c2f29d2e)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit c2f29d2e929e58e36b4986d3ff5364a0d825cfca (master).
Upstream Shortlog
-----------------
Ben Boeckel (1):
a5caf8a4 cmake: support an alias target
Modestas Vainius (1):
162b3ed7 SystemInformation: Fix compilation on GNU/{kFreeBSD,Hurd}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 516104b..43aec00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,7 @@
# target_link_libraries. Because of how interface
# properties propagate, this target is not suitable
# for use with PUBLIC or INTERFACE linking.
+# KWSYS_ALIAS_TARGET = The name of an alias target to create to the actual
target.
#
# Example:
#
@@ -887,6 +888,9 @@ IF(KWSYS_C_SRCS OR KWSYS_CXX_SRCS)
ADD_LIBRARY(${KWSYS_TARGET_INTERFACE} ${KWSYS_LIBRARY_TYPE}
${KWSYS_C_SRCS} ${KWSYS_CXX_SRCS})
ENDIF()
+ if (KWSYS_ALIAS_TARGET)
+ add_library(${KWSYS_ALIAS_TARGET} ALIAS ${KWSYS_TARGET_INTERFACE})
+ endif ()
SET_TARGET_PROPERTIES(${KWSYS_TARGET_OBJECT} PROPERTIES
C_CLANG_TIDY ""
CXX_CLANG_TIDY ""
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 7545ec7..d368fa2 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -112,7 +112,8 @@ typedef int siginfo_t;
# endif
#endif
-#if defined(__linux) || defined(__sun) || defined(_SCO_DS)
+#if defined(__linux) || defined(__sun) || defined(_SCO_DS) || \
+ defined(__GLIBC__) || defined(__GNU__)
# include <netdb.h>
# include <netinet/in.h>
# include <sys/socket.h>
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/CMakeLists.txt | 4 ++++
Source/kwsys/SystemInformation.cxx | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
https://cmake.org/mailman/listinfo/cmake-commits
