فهرست منبع

Merge branch 'upstream-KWSys' into update-kwsys

* upstream-KWSys:
  KWSys 2018-10-19 (c2f29d2e)
Brad King 7 سال پیش
والد
کامیت
a833c24ceb
2فایلهای تغییر یافته به همراه6 افزوده شده و 1 حذف شده
  1. 4 0
      Source/kwsys/CMakeLists.txt
  2. 2 1
      Source/kwsys/SystemInformation.cxx

+ 4 - 0
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 ""

+ 2 - 1
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>