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/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/CMakeLists.txt')
| -rw-r--r-- | host/lib/usrp/CMakeLists.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/host/lib/usrp/CMakeLists.txt b/host/lib/usrp/CMakeLists.txt index 5c9592970..a2b94b01c 100644 --- a/host/lib/usrp/CMakeLists.txt +++ b/host/lib/usrp/CMakeLists.txt @@ -18,8 +18,6 @@ ######################################################################## # This file included, use CMake directory variables ######################################################################## -find_package(GPSD) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) LIBUHD_APPEND_SOURCES( @@ -43,8 +41,6 @@ IF(ENABLE_C_API) ) ENDIF(ENABLE_C_API) -LIBUHD_REGISTER_COMPONENT("GPSD" ENABLE_GPSD OFF "ENABLE_LIBUHD;ENABLE_GPSD;LIBGPS_FOUND" OFF OFF) - IF(ENABLE_GPSD) LIBUHD_APPEND_SOURCES( ${CMAKE_CURRENT_SOURCE_DIR}/gpsd_iface.cpp |