From db3db1e2f031b543dccfb946afa311553e86f79c Mon Sep 17 00:00:00 2001
From: Nicholas Corgan <nick.corgan@ettus.com>
Date: Fri, 8 Jan 2016 11:23:30 -0800
Subject: cmake: removed unnecessary include

---
 host/lib/usrp/common/CMakeLists.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'host/lib')

diff --git a/host/lib/usrp/common/CMakeLists.txt b/host/lib/usrp/common/CMakeLists.txt
index e63a09935..9dabc4e0b 100644
--- a/host/lib/usrp/common/CMakeLists.txt
+++ b/host/lib/usrp/common/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2011-2013 Ettus Research LLC
+# Copyright 2011-2013,2016 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
@@ -19,8 +19,6 @@
 # This file included, use CMake directory variables
 ########################################################################
 IF(ENABLE_USB)
-    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/../firmware/fx2/common)
-
     LIBUHD_APPEND_SOURCES(
         ${CMAKE_CURRENT_SOURCE_DIR}/fx2_ctrl.cpp
     )
-- 
cgit v1.2.3


From 23ed1af481aa4a2901887a3127d42cf398fd40f5 Mon Sep 17 00:00:00 2001
From: Brooks Prumo <brooks@prumo.org>
Date: Fri, 15 Jan 2016 17:19:47 -0600
Subject: uhd: add CMake flag for the Windows registry key to specify UHD
 images directory

---
 host/CMakeLists.txt      | 6 +++---
 host/lib/utils/paths.cpp | 8 ++------
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'host/lib')

diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 8953e839d..6ac281ccc 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -75,9 +75,9 @@ OPTION(UHD_IMAGES_DIR "Path to installed UHD image binaries.")
 MESSAGE( STATUS "Using UHD Images Directory: ${UHD_IMAGES_DIR}" )
 ADD_DEFINITIONS(-DUHD_IMAGES_DIR=${UHD_IMAGES_DIR})
 
-IF(DEFINED USE_NIUSRP_WINREG_KEY)
-    ADD_DEFINITIONS(-DUSE_NIUSRP_WINREG_KEY)
-ENDIF(DEFINED USE_NIUSRP_WINREG_KEY)
+IF(DEFINED UHD_IMAGES_DIR_WINREG_KEY)
+    ADD_DEFINITIONS(-DUHD_IMAGES_DIR_WINREG_KEY=${UHD_IMAGES_DIR_WINREG_KEY})
+ENDIF(DEFINED UHD_IMAGES_DIR_WINREG_KEY)
 
 ########################################################################
 # Local Include Dir
diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp
index eb9e69a49..ebc18fe93 100644
--- a/host/lib/utils/paths.cpp
+++ b/host/lib/utils/paths.cpp
@@ -41,10 +41,6 @@
 #include <windows.h> //GetTempPath
 #endif
 
-#ifdef USE_NIUSRP_WINREG_KEY
-#define NIUSRP_WINREG_KEY "[HKLM\\Software\\National Instruments\\NI-USRP\\DriverBitfilesDir]"
-#endif
-
 namespace fs = boost::filesystem;
 
 /*! Get the value of an environment variable.
@@ -287,8 +283,8 @@ std::string uhd::get_images_dir(const std::string &search_paths) {
      * (see below). Making a local copy for const correctness. */
     std::string _search_paths = search_paths;
 
-#ifdef USE_NIUSRP_WINREG_KEY
-    _search_paths = std::string(NIUSRP_WINREG_KEY) + "," + search_paths;
+#ifdef UHD_IMAGES_DIR_WINREG_KEY
+    _search_paths = std::string("UHD_IMAGES_DIR_WINREG_KEY") + "," + search_paths;
 #endif
 
     /* Now we will parse and attempt to qualify the paths in the `search_paths`
-- 
cgit v1.2.3