From cce90d3d9babc955a839e9ec8cfd36cbfb759fb0 Mon Sep 17 00:00:00 2001
From: Ashish Chaudhari <ashish@ettus.com>
Date: Thu, 7 Aug 2014 10:10:23 -0700
Subject: octoclock: Fixed merge conflict. Utils compile now.

---
 host/utils/CMakeLists.txt | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3