diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-19 14:29:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-10-19 14:29:07 (GMT) |
| commit | de1dec70528d22b23e9f0d8d0d17de5e8124acf4 (patch) | |
| tree | a20ecaa6c59282fc429edf7780c2377c64b6b24d | |
| parent | bb6d439290bd4645111ca4aa9fda810dcc132dbf (diff) | |
| parent | a833c24cebe193eb71bed11a6fe949525110dfd2 (diff) | |
| download | CMake-de1dec70528d22b23e9f0d8d0d17de5e8124acf4.zip CMake-de1dec70528d22b23e9f0d8d0d17de5e8124acf4.tar.gz CMake-de1dec70528d22b23e9f0d8d0d17de5e8124acf4.tar.bz2 | |
Merge branch 'update-kwsys' into release-3.13
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> |