diff options
| author | Josh Blum <josh@joshknows.com> | 2010-12-22 17:33:43 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-12-22 17:33:43 -0800 |
| commit | 67e89717659605e4d8e0ddd26e4ccef4dec24eb2 (patch) | |
| tree | a011be8ad75e13fd98d61c8b31ed218e0bce687c /host/lib/usrp/CMakeLists.txt | |
| parent | 94682e4b04d9304a2f39c192bf423c4ee9f38e69 (diff) | |
| parent | 8f93121987af42d8b049d29cd8ea101a6306fa87 (diff) | |
| download | uhd-67e89717659605e4d8e0ddd26e4ccef4dec24eb2.tar.gz uhd-67e89717659605e4d8e0ddd26e4ccef4dec24eb2.tar.bz2 uhd-67e89717659605e4d8e0ddd26e4ccef4dec24eb2.zip | |
Merge branch 'master' into next
Conflicts:
host/lib/usrp/usrp2/CMakeLists.txt
Diffstat (limited to 'host/lib/usrp/CMakeLists.txt')
| -rw-r--r-- | host/lib/usrp/CMakeLists.txt | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/host/lib/usrp/CMakeLists.txt b/host/lib/usrp/CMakeLists.txt index bd26d29a1..9dc74a5fe 100644 --- a/host/lib/usrp/CMakeLists.txt +++ b/host/lib/usrp/CMakeLists.txt @@ -15,25 +15,26 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -#This file will be included by cmake, use absolute paths! - +######################################################################## +# This file included, use CMake directory variables +######################################################################## LIBUHD_APPEND_SOURCES( - ${CMAKE_SOURCE_DIR}/lib/usrp/dboard_base.cpp - ${CMAKE_SOURCE_DIR}/lib/usrp/dboard_eeprom.cpp - ${CMAKE_SOURCE_DIR}/lib/usrp/dboard_id.cpp - ${CMAKE_SOURCE_DIR}/lib/usrp/dboard_iface.cpp - ${CMAKE_SOURCE_DIR}/lib/usrp/dboard_manager.cpp - ${CMAKE_SOURCE_DIR}/lib/usrp/dsp_utils.cpp - ${CMAKE_SOURCE_DIR}/lib/usrp/mboard_eeprom.cpp - ${CMAKE_SOURCE_DIR}/lib/usrp/misc_utils.cpp - ${CMAKE_SOURCE_DIR}/lib/usrp/multi_usrp.cpp - ${CMAKE_SOURCE_DIR}/lib/usrp/single_usrp.cpp - ${CMAKE_SOURCE_DIR}/lib/usrp/subdev_spec.cpp - ${CMAKE_SOURCE_DIR}/lib/usrp/tune_helper.cpp - ${CMAKE_SOURCE_DIR}/lib/usrp/wrapper_utils.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/dboard_base.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dboard_eeprom.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dboard_id.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dboard_iface.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dboard_manager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dsp_utils.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/mboard_eeprom.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/misc_utils.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/multi_usrp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/single_usrp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/subdev_spec.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tune_helper.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/wrapper_utils.hpp ) -INCLUDE(${CMAKE_SOURCE_DIR}/lib/usrp/dboard/CMakeLists.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/CMakeLists.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/CMakeLists.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/CMakeLists.txt) +INCLUDE_SUBDIRECTORY(dboard) +INCLUDE_SUBDIRECTORY(usrp1) +INCLUDE_SUBDIRECTORY(usrp2) +INCLUDE_SUBDIRECTORY(usrp_e100) |