diff options
| author | Josh Blum <josh@joshknows.com> | 2010-04-01 15:16:29 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-04-01 15:16:29 +0000 |
| commit | 8fd3ce07369a7962dc8eb5ace2007a80ad7dd907 (patch) | |
| tree | bb4f5c61f8a7809af1c58d5513dc6c3e78c7a5b2 /host/lib/CMakeLists.txt | |
| parent | 58d71729716a688af36ba4a413e6f6ee4729eefc (diff) | |
| parent | f1f4865119605c66ffece113a621308d82512d23 (diff) | |
| download | uhd-8fd3ce07369a7962dc8eb5ace2007a80ad7dd907.tar.gz uhd-8fd3ce07369a7962dc8eb5ace2007a80ad7dd907.tar.bz2 uhd-8fd3ce07369a7962dc8eb5ace2007a80ad7dd907.zip | |
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhd into usrp_e
Conflicts:
host/include/uhd/usrp/CMakeLists.txt
Diffstat (limited to 'host/lib/CMakeLists.txt')
| -rw-r--r-- | host/lib/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index 4e8dea6c5..3dfd54312 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -22,8 +22,6 @@ SET(libuhd_sources device.cpp gain_handler.cpp load_modules.cpp - simple_device.cpp - tune_helper.cpp types.cpp wax.cpp transport/if_addrs.cpp @@ -32,7 +30,9 @@ SET(libuhd_sources usrp/dboard/db_basic_and_lf.cpp usrp/dboard_base.cpp usrp/dboard_interface.cpp + usrp/simple_usrp.cpp usrp/dboard_manager.cpp + usrp/tune_helper.cpp usrp/usrp2/dboard_impl.cpp usrp/usrp2/dboard_interface.cpp usrp/usrp2/dsp_impl.cpp |