diff options
| author | Josh Blum <josh@joshknows.com> | 2010-03-30 13:32:52 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-03-30 13:32:52 +0000 |
| commit | f94fa1e464c9e2a87274c991dc6461f7f4c956d8 (patch) | |
| tree | 1b88020a0dece1ae509cf3fb219b7cce487dc198 /host/lib/CMakeLists.txt | |
| parent | 29e88b3478aad89ff76363029395200a8601e667 (diff) | |
| parent | 281307833c8275031bd2469e6aef3f472490749a (diff) | |
| download | uhd-f94fa1e464c9e2a87274c991dc6461f7f4c956d8.tar.gz uhd-f94fa1e464c9e2a87274c991dc6461f7f4c956d8.tar.bz2 uhd-f94fa1e464c9e2a87274c991dc6461f7f4c956d8.zip | |
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhd into usrp_e
Conflicts:
host/include/uhd/usrp/dboard_id.hpp
host/lib/usrp/usrp2/usrp2_impl.cpp
Diffstat (limited to 'host/lib/CMakeLists.txt')
| -rw-r--r-- | host/lib/CMakeLists.txt | 39 |
1 files changed, 29 insertions, 10 deletions
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index 46cce729e..323b69b14 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -20,14 +20,13 @@ ######################################################################## SET(libuhd_sources device.cpp - device_addr.cpp gain_handler.cpp load_modules.cpp - metadata.cpp simple_device.cpp - time_spec.cpp + tune_helper.cpp types.cpp wax.cpp + transport/if_addrs.cpp transport/udp_simple.cpp transport/vrt.cpp usrp/dboard/basic.cpp @@ -83,22 +82,42 @@ ENDIF(HAS_USRP1E_REQUIRED_HEADERS) ######################################################################## # Setup defines for module loading ######################################################################## -INCLUDE(CheckIncludeFileCXX) +MESSAGE(STATUS "Configuring module loading...") +INCLUDE(CheckIncludeFileCXX) CHECK_INCLUDE_FILE_CXX(dlfcn.h HAVE_DLFCN_H) -CHECK_INCLUDE_FILE_CXX(Winbase.h HAVE_WINBASE_H) +CHECK_INCLUDE_FILE_CXX(windows.h HAVE_WINDOWS_H) IF(HAVE_DLFCN_H) - MESSAGE(STATUS "Module loading supported through dlopen...") + MESSAGE(STATUS " Module loading supported through dlopen.") ADD_DEFINITIONS(-DHAVE_DLFCN_H) -ELSEIF(HAVE_WINBASE_H) - MESSAGE(STATUS "Module loading supported through LoadLibrary...") - ADD_DEFINITIONS(-DHAVE_WINBASE_H) +ELSEIF(HAVE_WINDOWS_H) + MESSAGE(STATUS " Module loading supported through LoadLibrary.") + ADD_DEFINITIONS(-DHAVE_WINDOWS_H) ELSE(HAVE_DLFCN_H) - MESSAGE(STATUS "Module loading not supported...") + MESSAGE(STATUS " Module loading not supported.") ENDIF(HAVE_DLFCN_H) ######################################################################## +# Setup defines for interface address discovery +######################################################################## +MESSAGE(STATUS "Configuring interface address discovery...") + +INCLUDE(CheckIncludeFileCXX) +CHECK_INCLUDE_FILE_CXX(ifaddrs.h HAVE_IFADDRS_H) +CHECK_INCLUDE_FILE_CXX(winsock2.h HAVE_WINSOCK2_H) + +IF(HAVE_IFADDRS_H) + MESSAGE(STATUS " Interface address discovery supported through getifaddrs.") + ADD_DEFINITIONS(-DHAVE_IFADDRS_H) +ELSEIF(HAVE_WINSOCK2_H) + MESSAGE(STATUS " Interface address discovery supported through SIO_GET_INTERFACE_LIST.") + ADD_DEFINITIONS(-DHAVE_WINSOCK2_H) +ELSE(HAVE_IFADDRS_H) + MESSAGE(STATUS " Interface address discovery not supported.") +ENDIF(HAVE_IFADDRS_H) + +######################################################################## # Setup libuhd library ######################################################################## ADD_LIBRARY(uhd SHARED ${libuhd_sources}) |