diff options
| author | Josh Blum <josh@joshknows.com> | 2011-04-19 17:47:36 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-04-19 17:47:36 -0700 |
| commit | fdee3ba82b997c709e6822aa000df8adb61c56a5 (patch) | |
| tree | ed566f55ef024fd2a45d053a719010e1b2c49366 /host/usrp_e_utils/CMakeLists.txt | |
| parent | ee424d797fc37a8c3c2a82a58218bf1e85456226 (diff) | |
| parent | 290bb75de236cb53c54bb4599cc2dde924f9800e (diff) | |
| download | uhd-fdee3ba82b997c709e6822aa000df8adb61c56a5.tar.gz uhd-fdee3ba82b997c709e6822aa000df8adb61c56a5.tar.bz2 uhd-fdee3ba82b997c709e6822aa000df8adb61c56a5.zip | |
Merge branch 'master' into next
Conflicts:
fpga/usrp2/top/u2plus/Makefile.N200
Diffstat (limited to 'host/usrp_e_utils/CMakeLists.txt')
| -rw-r--r-- | host/usrp_e_utils/CMakeLists.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/host/usrp_e_utils/CMakeLists.txt b/host/usrp_e_utils/CMakeLists.txt index 1ecd2ac46..e7d6ae4b8 100644 --- a/host/usrp_e_utils/CMakeLists.txt +++ b/host/usrp_e_utils/CMakeLists.txt @@ -18,11 +18,7 @@ ######################################################################## # USRP embedded utilities that get installed into the share path ######################################################################## -IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") - SET(LINUX_TARGET TRUE) -ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux") - -LIBUHD_REGISTER_COMPONENT("USRP-E Utils" ENABLE_USRP_E_UTILS OFF "LINUX_TARGET" OFF) +LIBUHD_REGISTER_COMPONENT("USRP-E Utils" ENABLE_USRP_E_UTILS OFF "LINUX" OFF) IF(ENABLE_USRP_E_UTILS) ENABLE_LANGUAGE(C) @@ -37,6 +33,7 @@ IF(ENABLE_USRP_E_UTILS) usrp-e-timed.c usrp-e-wb-test.cpp usrp-e-debug-pins.c + usrp-e-gpio.c usrp-e-i2c.c usrp-e-spi.c ) |