aboutsummaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
authorAshish Chaudhari <ashish@ettus.com>2014-08-07 10:10:23 -0700
committerAshish Chaudhari <ashish@ettus.com>2014-08-07 10:10:23 -0700
commitcce90d3d9babc955a839e9ec8cfd36cbfb759fb0 (patch)
tree3f00f1043818fdd377a5aeb22ece607d6d4e9d68 /host
parent64c1d64901860c55acd1cfd21508e6b89a35a6ed (diff)
downloaduhd-cce90d3d9babc955a839e9ec8cfd36cbfb759fb0.tar.gz
uhd-cce90d3d9babc955a839e9ec8cfd36cbfb759fb0.tar.bz2
uhd-cce90d3d9babc955a839e9ec8cfd36cbfb759fb0.zip
octoclock: Fixed merge conflict. Utils compile now.
Diffstat (limited to 'host')
-rw-r--r--host/utils/CMakeLists.txt16
1 files changed, 15 insertions, 1 deletions
diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt
index 8561df088..11bb2488a 100644
--- a/host/utils/CMakeLists.txt
+++ b/host/utils/CMakeLists.txt
@@ -1,5 +1,5 @@
#
-# Copyright 2010-2013 Ettus Research LLC
+# Copyright 2010-2014 Ettus Research LLC
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -67,6 +67,20 @@ IF(ENABLE_USB)
${CMAKE_CURRENT_SOURCE_DIR}/../lib/usrp/common
${CMAKE_CURRENT_SOURCE_DIR}/../lib/usrp/common/ad9361_driver)
ENDIF(ENABLE_USB)
+IF(ENABLE_OCTOCLOCK)
+ LIST(APPEND util_share_sources
+ octoclock_burn_eeprom.cpp
+ )
+
+ SET(octoclock_burner_sources
+ octoclock_firmware_burner.cpp
+ ihexcvt.cpp
+ )
+
+ ADD_EXECUTABLE(octoclock_firmware_burner ${octoclock_burner_sources})
+ TARGET_LINK_LIBRARIES(octoclock_firmware_burner uhd ${Boost_LIBRARIES})
+ UHD_INSTALL(TARGETS octoclock_firmware_burner RUNTIME DESTINATION ${RUNTIME_DIR} COMPONENT utilities)
+ENDIF(ENABLE_OCTOCLOCK)
IF(LINUX AND ENABLE_USB)
UHD_INSTALL(FILES