diff options
author | Brad King <brad.king@kitware.com> | 2018-10-22 16:44:47 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2018-10-22 16:44:52 (GMT) |
commit | 1a26a67702b90b0c49d7d110b1a12cbde09c0879 (patch) | |
tree | b718e47b7245261e3122d9e935db8a9d59f83033 | |
parent | 649479d0532d389aed1ac86aabf24884276dba3a (diff) | |
parent | a833c24cebe193eb71bed11a6fe949525110dfd2 (diff) | |
download | CMake-1a26a67702b90b0c49d7d110b1a12cbde09c0879.zip CMake-1a26a67702b90b0c49d7d110b1a12cbde09c0879.tar.gz CMake-1a26a67702b90b0c49d7d110b1a12cbde09c0879.tar.bz2 |
Merge topic 'update-kwsys'
a833c24ceb Merge branch 'upstream-KWSys' into update-kwsys
43cb257648 KWSys 2018-10-19 (c2f29d2e)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2506
-rw-r--r-- | Source/kwsys/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Source/kwsys/SystemInformation.cxx | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index 516104b..43aec00 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/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/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 7545ec7..d368fa2 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/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> |