diff options
| author | Josh Blum <josh@joshknows.com> | 2011-04-07 12:01:10 -0500 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-04-07 12:01:10 -0500 |
| commit | f0a2601d456ba4b5a75a7f0c9d21d2ab517dacec (patch) | |
| tree | c6b0aa9c7a29a0dd39545bd5832b3b39eabaf9fe /host/lib | |
| parent | e2cd276da0b23f59ba028b2f57443c27f921fa00 (diff) | |
| parent | 74fc8946688d53ccd5d067d3f86e26b990af1bd4 (diff) | |
| download | uhd-f0a2601d456ba4b5a75a7f0c9d21d2ab517dacec.tar.gz uhd-f0a2601d456ba4b5a75a7f0c9d21d2ab517dacec.tar.bz2 uhd-f0a2601d456ba4b5a75a7f0c9d21d2ab517dacec.zip | |
Merge branch 'mingw_cygwin'
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/transport/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | host/lib/utils/CMakeLists.txt | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/host/lib/transport/CMakeLists.txt b/host/lib/transport/CMakeLists.txt index a5bf9c5f1..90360977a 100644 --- a/host/lib/transport/CMakeLists.txt +++ b/host/lib/transport/CMakeLists.txt @@ -79,6 +79,12 @@ SET_SOURCE_FILES_PROPERTIES( PROPERTIES COMPILE_DEFINITIONS "${IF_ADDRS_DEFS}" ) +#On windows, the boost asio implementation uses the winsock2 library. +#Note: we exclude the .lib extension for cygwin and mingw platforms. +IF(WIN32) + LIBUHD_APPEND_LIBS(ws2_32) +ENDIF() + ######################################################################## # Append to the list of sources for lib uhd ######################################################################## diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt index c0d99b37e..26c02b5b4 100644 --- a/host/lib/utils/CMakeLists.txt +++ b/host/lib/utils/CMakeLists.txt @@ -36,6 +36,11 @@ CHECK_CXX_SOURCE_COMPILES(" " HAVE_PTHREAD_SETSCHEDPARAM ) +IF(CYGWIN) + #SCHED_RR non-operational on cygwin + SET(HAVE_PTHREAD_SETSCHEDPARAM False) +ENDIF(CYGWIN) + CHECK_CXX_SOURCE_COMPILES(" #include <windows.h> int main(){ |