diff options
| author | Josh Blum <josh@joshknows.com> | 2011-04-04 16:51:17 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-04-04 16:51:17 -0700 |
| commit | 6a2fbe07e7674794a883a7062ce2225781cf5193 (patch) | |
| tree | 9727982f21ee47be95c4b89216da327e03e2707d | |
| parent | dcd555636c282ac0454b463c91d360ce062e316d (diff) | |
| download | uhd-6a2fbe07e7674794a883a7062ce2225781cf5193.tar.gz uhd-6a2fbe07e7674794a883a7062ce2225781cf5193.tar.bz2 uhd-6a2fbe07e7674794a883a7062ce2225781cf5193.zip | |
uhd: a few minor changes to get uhd building under mingw or cygwin
| -rw-r--r-- | host/lib/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | host/tests/CMakeLists.txt | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index 8ca7c7dca..268f05df6 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -69,6 +69,14 @@ MACRO(INCLUDE_SUBDIRECTORY subdir) ENDMACRO(INCLUDE_SUBDIRECTORY) ######################################################################## +# Cygwin special +######################################################################## +IF(CYGWIN) + ADD_DEFINITIONS(-D__USE_W32_SOCKETS) #boost asio says we need this + LIBUHD_APPEND_LIBS(ws2_32) +ENDIF(CYGWIN) + +######################################################################## # Include subdirectories (different than add) ######################################################################## INCLUDE_SUBDIRECTORY(ic_reg_maps) diff --git a/host/tests/CMakeLists.txt b/host/tests/CMakeLists.txt index 821b2eb9e..f08fe669b 100644 --- a/host/tests/CMakeLists.txt +++ b/host/tests/CMakeLists.txt @@ -50,5 +50,7 @@ ENDFOREACH(test_source) ######################################################################## # demo of a loadable module ######################################################################## -ADD_LIBRARY(module_test MODULE module_test.cpp) -TARGET_LINK_LIBRARIES(module_test uhd) +IF(MSVC OR APPLE OR LINUX) + ADD_LIBRARY(module_test MODULE module_test.cpp) + TARGET_LINK_LIBRARIES(module_test uhd) +ENDIF() |