diff options
author | Martin Braun <martin.braun@ettus.com> | 2015-11-16 15:21:42 -0800 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2015-11-16 15:21:44 -0800 |
commit | 3f1d0fb1bd597ea41d52828a9380fccdc06314bf (patch) | |
tree | 900cc1400470c3b4f2fc51d3af9de4c4dddd2d99 /host/lib/usrp/e300/CMakeLists.txt | |
parent | 88b0baeaf6dfa5f62f99ad53680108183ccc8721 (diff) | |
download | uhd-3f1d0fb1bd597ea41d52828a9380fccdc06314bf.tar.gz uhd-3f1d0fb1bd597ea41d52828a9380fccdc06314bf.tar.bz2 uhd-3f1d0fb1bd597ea41d52828a9380fccdc06314bf.zip |
cmake: Register components earlier
All device-specific CMake components are now registered in one place,
before the host/lib/ subdirs are sourced. This way, there are no
cyclic dependencies.
This solves the issue where ENABLE_X300=Off could disable USB, but
preserves the fix where ENABLE_X300=Off would still build some X300
codes.
Diffstat (limited to 'host/lib/usrp/e300/CMakeLists.txt')
-rw-r--r-- | host/lib/usrp/e300/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/host/lib/usrp/e300/CMakeLists.txt b/host/lib/usrp/e300/CMakeLists.txt index 9c8aa29b9..68c3520e4 100644 --- a/host/lib/usrp/e300/CMakeLists.txt +++ b/host/lib/usrp/e300/CMakeLists.txt @@ -24,8 +24,6 @@ ######################################################################## find_package(UDev) -LIBUHD_REGISTER_COMPONENT("E300" ENABLE_E300 OFF "ENABLE_LIBUHD" OFF OFF) - IF(ENABLE_E300) LIST(APPEND E300_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/e300_impl.cpp |