diff options
| author | Josh Blum <josh@joshknows.com> | 2011-04-06 09:55:54 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-04-06 09:55:54 -0700 |
| commit | 74fc8946688d53ccd5d067d3f86e26b990af1bd4 (patch) | |
| tree | 901e051e2724cc021bc695e0d7df209ea50d06ec | |
| parent | dbfbc497a8e0a144e0db2b8daa0f4baba5284775 (diff) | |
| download | uhd-74fc8946688d53ccd5d067d3f86e26b990af1bd4.tar.gz uhd-74fc8946688d53ccd5d067d3f86e26b990af1bd4.tar.bz2 uhd-74fc8946688d53ccd5d067d3f86e26b990af1bd4.zip | |
uhd: always link winsock2 on windows, disable pthread SCHED_RR for cygwin
| -rw-r--r-- | host/lib/transport/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/lib/utils/CMakeLists.txt | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/host/lib/transport/CMakeLists.txt b/host/lib/transport/CMakeLists.txt index 30f8db48a..90360977a 100644 --- a/host/lib/transport/CMakeLists.txt +++ b/host/lib/transport/CMakeLists.txt @@ -79,7 +79,9 @@ SET_SOURCE_FILES_PROPERTIES( PROPERTIES COMPILE_DEFINITIONS "${IF_ADDRS_DEFS}" ) -IF(WIN32 AND UNIX) #MinGW/Cygwin needs winsock2 +#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() 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(){ |