diff options
| author | Josh Blum <josh@joshknows.com> | 2010-11-10 11:27:42 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-11-10 11:27:42 -0800 |
| commit | 123de6dad521ca3dbc44a5d9fc70ff754f1196e3 (patch) | |
| tree | 53f03bfd7a33e85646c5c21ad685e48202789eb5 /host/utils | |
| parent | 793519d66aa569f45bbda25ba7f36c1534a451bb (diff) | |
| parent | 8c434f7d63aca25b55d6d13dffcc1d7037261d4f (diff) | |
| download | uhd-123de6dad521ca3dbc44a5d9fc70ff754f1196e3.tar.gz uhd-123de6dad521ca3dbc44a5d9fc70ff754f1196e3.tar.bz2 uhd-123de6dad521ca3dbc44a5d9fc70ff754f1196e3.zip | |
Merge branch 'master' into usrp_e100_i2c
Conflicts:
host/utils/CMakeLists.txt
Diffstat (limited to 'host/utils')
| -rw-r--r-- | host/utils/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt index 44a3bbdb2..0edf5a78c 100644 --- a/host/utils/CMakeLists.txt +++ b/host/utils/CMakeLists.txt @@ -37,9 +37,14 @@ ENDFOREACH(util_source) SET(util_share_sources usrp_burn_db_eeprom.cpp usrp_burn_mb_eeprom.cpp - usrp1_init_eeprom.cpp ) +IF(ENABLE_USRP1) + LIST(APPEND util_share_sources + usrp1_init_eeprom.cpp + ) +ENDIF(ENABLE_USRP1) + IF(ENABLE_USRP_E100) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/include) LIST(APPEND util_share_sources |