diff options
author | Josh Blum <josh@joshknows.com> | 2010-12-27 16:57:09 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-12-27 16:57:09 -0800 |
commit | 5c08896e6c4124de69f43f0765468dc4d517920b (patch) | |
tree | 47ef644eadac0e9271eb26e4e222035461f6bfae /host/lib/usrp | |
parent | bf8677c9a96c3ed7fae48a57759b9f4742cd7593 (diff) | |
parent | 7d3842dbd01175dc04cbd77e852b30af3ab5ac35 (diff) | |
download | uhd-5c08896e6c4124de69f43f0765468dc4d517920b.tar.gz uhd-5c08896e6c4124de69f43f0765468dc4d517920b.tar.bz2 uhd-5c08896e6c4124de69f43f0765468dc4d517920b.zip |
Merge branch 'uhd_master' into uhd_next
Diffstat (limited to 'host/lib/usrp')
-rw-r--r-- | host/lib/usrp/usrp_e100/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp_e100/CMakeLists.txt b/host/lib/usrp/usrp_e100/CMakeLists.txt index 5d8a9791d..c32dd87f8 100644 --- a/host/lib/usrp/usrp_e100/CMakeLists.txt +++ b/host/lib/usrp/usrp_e100/CMakeLists.txt @@ -22,7 +22,11 @@ ######################################################################## # Conditionally configure the USRP-E100 support ######################################################################## -LIBUHD_REGISTER_COMPONENT("USRP-E100" ENABLE_USRP_E100 OFF "ENABLE_LIBUHD" ON) +IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") + SET(LINUX_TARGET TRUE) +ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux") + +LIBUHD_REGISTER_COMPONENT("USRP-E100" ENABLE_USRP_E100 OFF "ENABLE_LIBUHD;LINUX_TARGET" OFF) IF(ENABLE_USRP_E100) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) |